Merge
Tomas Doran [Mon, 2 Aug 2010 08:21:07 +0000 (09:21 +0100)]

Trivial merge