Merge remote branch 'origin/master'
authorHarald Welte <laforge@gnumonks.org>
Fri, 19 Mar 2010 10:45:42 +0000 (18:45 +0800)
committerHarald Welte <laforge@gnumonks.org>
Fri, 19 Mar 2010 10:45:42 +0000 (18:45 +0800)

Trivial merge