Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 09 Oct 2010 15:47:19 +0100
changeset 832 1f1db3dc9ddf
parent 825 908e4fe6c177 (diff)
parent 831 1069be3ee9db (current diff)
child 835 d3f66c4952ae
Merge with stable