Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 17 Sep 2010 20:53:56 +0200
changeset 794 12eadf33cce1
parent 790 b14093780eaf (diff)
parent 793 9cc90e2c826f (current diff)
child 796 13bba4066f90
Merge with stable