Merge branch 'eumm652' into blead
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Tue, 2 Jun 2009 06:46:41 +0000 (08:46 +0200)
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Tue, 2 Jun 2009 06:46:41 +0000 (08:46 +0200)

Trivial merge