Merge remote branch 'gravitystorm/relationrevert'
authorRichard Fairhurst <richard@systemeD.net>
Fri, 27 May 2011 14:00:27 +0000 (15:00 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 27 May 2011 14:00:27 +0000 (15:00 +0100)

Trivial merge