Merge branch 'eumm652' into blead
Rafael Garcia-Suarez [Tue, 2 Jun 2009 06:46:41 +0000 (08:46 +0200)]

Trivial merge