[SCM] grits branch, master, updated. upstream/0.4.2-7-gaccbd93

[Andy Spencer]

The following commit has been merged in the master branch:
commit 94c321cc66763903eb2408c2d6d5e62009f8fb64
Merge: 1b309ba6dbdf4dd7ee9dd9a963fe1a8071a78a62 00594adc1dc81dadebd87e1dda47977b5d830308
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Sun Jun 19 21:46:24 2011 +0000

    Merge commit 'upstream/0.5'


-- 
A Virtual Globe library