Merge commit 'lseed/master'
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 22:31:06 +0000 (00:31 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 22:31:06 +0000 (00:31 +0200)

Trivial merge