Merge branch 'drawquad' into staging
authorRichard Fairhurst <richard@systemeD.net>
Sat, 7 May 2011 17:11:27 +0000 (18:11 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 7 May 2011 17:11:27 +0000 (18:11 +0100)

Trivial merge