Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 16 Nov 2010 16:59:06 +0100
changeset 863 de49207ef1a5
parent 861 bbb042e55f49 (diff)
parent 862 c333552ec003 (current diff)
child 864 2cadbd48a31b
Merge with stable