Merge remote branch 'albrecht/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 4 Apr 2010 23:27:23 +0000 (01:27 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 4 Apr 2010 23:27:23 +0000 (01:27 +0200)

Trivial merge