Merge commit 'alioth/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 14 Oct 2007 01:20:10 +0000 (03:20 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 14 Oct 2007 01:20:10 +0000 (03:20 +0200)

Trivial merge