Merge branch 't/doc'
authorAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:02:15 +0000 (13:02 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 11:02:15 +0000 (13:02 +0200)

Trivial merge