Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 20 Oct 2010 22:46:09 +0100
changeset 845 42c5129e9c66
parent 842 12f6e285e4e7 (diff)
parent 844 e5e1c16fe5b7 (current diff)
child 846 d565787a8a5d
Merge with stable