Merge remote branch 'origin/sylvain/pending'
authorHarald Welte <laforge@gnumonks.org>
Wed, 28 Apr 2010 09:43:50 +0000 (11:43 +0200)
committerHarald Welte <laforge@gnumonks.org>
Wed, 28 Apr 2010 09:43:50 +0000 (11:43 +0200)

Trivial merge