Merge commit 'lseed/master'
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 21:15:52 +0000 (23:15 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 21:15:52 +0000 (23:15 +0200)

Trivial merge