Merge remote branch 'origin/master'
authorHarald Welte <laforge@gnumonks.org>
Tue, 1 Jun 2010 19:21:20 +0000 (21:21 +0200)
committerHarald Welte <laforge@gnumonks.org>
Tue, 1 Jun 2010 19:21:20 +0000 (21:21 +0200)

Trivial merge