[SCM] grits branch, master, updated. upstream/0.5-17-g5e5715f

[Andy Spencer]

The following commit has been merged in the master branch:
commit 1f0e12092bf0b724d2cd56691ca6387cf026eb4b
Merge: 01d2f6ff8de9f399ac2f0bb2026f23fe91314ce5 efd6dc8812bffe561ea08a795de483b712c59028
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Aug 24 17:44:25 2011 +0000

    Merge commit 'upstream/0.5.1'


-- 
A Virtual Globe library