Merge
Tomas Doran [Wed, 27 Jun 2012 23:51:32 +0000 (00:51 +0100)]

Trivial merge