Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 20 Jan 2010 10:14:36 +0100
changeset 675 56bc2e01e08e
parent 670 80d0ed025a02 (diff)
parent 674 0efa9d6ac11f (current diff)
child 677 9bdbae6007cb
Merge with stable