Merge remote-tracking branch 'boock/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:08:41 +0000 (10:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:08:41 +0000 (10:08 +0200)

Trivial merge