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

Trivial merge