Merge remote branch 'boock/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 24 Mar 2011 12:20:13 +0000 (13:20 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 24 Mar 2011 12:20:13 +0000 (13:20 +0100)

Trivial merge