Merge commit 'sio/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 8 Dec 2008 16:21:51 +0000 (17:21 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 8 Dec 2008 16:21:51 +0000 (17:21 +0100)

Trivial merge