Merge 'trunk' into 'mc_fixes'
Peter Rabbitson [Sat, 6 Jun 2009 09:12:03 +0000 (09:12 +0000)]
Let's try again


Trivial merge