Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Aug 2011 16:59:59 +0000 (18:59 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Aug 2011 16:59:59 +0000 (18:59 +0200)

Trivial merge