Merge branch 'nobangs' into blead
Rafael Garcia-Suarez [Wed, 22 Jul 2009 09:55:18 +0000 (11:55 +0200)]

Trivial merge