[SCM] grits branch, master, updated. upstream/0.6-26-g84c710d

[Andy Spencer]

The following commit has been merged in the master branch:
commit 141e43c11d7cfdf77c6a1923c8d2a69140254c27
Merge: 3bec3e09f3f2a74cf2b6fd1a4c35e8a05789deac 477b9cf6962384b1fe1429da2b71be78bcad5d39
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Fri Nov 25 07:52:10 2011 +0000

    Merge commit 'upstream/0.6.1'


-- 
A Virtual Globe library