Merge commit 'local_master/master'
root [Fri, 20 Aug 2010 13:09:28 +0000 (15:09 +0200)]

Trivial merge