Merge branch 'blead' into dual/Safe
Rafael Garcia-Suarez [Tue, 25 Aug 2009 07:34:18 +0000 (09:34 +0200)]

Trivial merge