Merge commit 'remotes/yangtse/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 9 Dec 2007 21:02:06 +0000 (22:02 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 9 Dec 2007 21:02:06 +0000 (22:02 +0100)

Trivial merge