Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 13 Oct 2010 09:21:19 +0100
changeset 841 a6865ff86aaf
parent 838 c793c1a87f1c (diff)
parent 840 df93d61a7790 (current diff)
child 842 12f6e285e4e7
Merge with stable