Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 10 Oct 2010 01:10:13 +0100
changeset 835 d3f66c4952ae
parent 832 1f1db3dc9ddf (diff)
parent 834 5a6898736b1a (current diff)
child 836 53a9228f13de
Merge with stable