Merge remote branch 'origin/sylvain/pending'
authorHarald Welte <laforge@gnumonks.org>
Thu, 29 Jul 2010 09:10:09 +0000 (11:10 +0200)
committerHarald Welte <laforge@gnumonks.org>
Thu, 29 Jul 2010 09:10:09 +0000 (11:10 +0200)

Trivial merge