Merge commit 'alioth/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 9 Dec 2007 17:24:07 +0000 (18:24 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 9 Dec 2007 17:24:07 +0000 (18:24 +0100)

Trivial merge