Merge commit 'origin/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 23 Nov 2007 20:08:51 +0000 (21:08 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 23 Nov 2007 20:08:51 +0000 (21:08 +0100)

Trivial merge