Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 11 Feb 2011 04:55:00 +0100 (2011-02-11)
changeset 879 0738a9d72c57
parent 878 e1a93489159d
child 881 cd432ceb6544
Merge with stable