Merge commit 'remotes/yangtse/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 15:32:02 +0000 (16:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 15:32:02 +0000 (16:32 +0100)

Trivial merge