Merge commit 'dromedary/blead' into blead
Vincent Pit [Thu, 13 Aug 2009 12:43:08 +0000 (14:43 +0200)]

Trivial merge