[SCM] grits branch, master, updated. upstream/0.5.1-25-g3bec3e0

[Andy Spencer]

The following commit has been merged in the master branch:
commit 4d234a285f04c531cb8e9d4d57724d4121a01472
Merge: eb041e128c63443db591994ba02ae221b9a65b7a e943ead45d87968ffc586383c3e86cf33b4b0cbc
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Nov 2 08:09:34 2011 +0000

    Merge commit 'upstream/0.6'


-- 
A Virtual Globe library