Merge remote branch 'gravitystorm/relationmembers'
authorRichard Fairhurst <richard@systemeD.net>
Fri, 27 May 2011 11:25:45 +0000 (12:25 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 27 May 2011 11:25:45 +0000 (12:25 +0100)

Trivial merge