Merge commit 'alioth/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 18 Oct 2007 20:04:00 +0000 (22:04 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 18 Oct 2007 20:04:00 +0000 (22:04 +0200)

Trivial merge