Merge remote-tracking branch 'boock/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 2 Mar 2011 10:38:43 +0000 (11:38 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 2 Mar 2011 10:38:43 +0000 (11:38 +0100)

Trivial merge