Merge with local changes
authorHenning Rogge <hrogge@googlemail.com>
Sun, 16 Aug 2009 11:04:19 +0000 (13:04 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Sun, 16 Aug 2009 11:04:19 +0000 (13:04 +0200)

Trivial merge