Merge branch 'strict-by-default' into blead
Rafael Garcia-Suarez [Tue, 7 Jul 2009 20:32:39 +0000 (22:32 +0200)]

Trivial merge