Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 17 Feb 2010 11:15:18 +0100
changeset 684 4da6285efe4c
parent 677 9bdbae6007cb (diff)
parent 683 26ca426a04e1 (current diff)
child 685 6d26c4bafda3
Merge with stable