[SCM] grits branch, master, updated. upstream/0.6-33-g736184a

[Andy Spencer]

The following commit has been merged in the master branch:
commit 3b6cc71bfd636ee28080175ea6223ebeabd22a82
Merge: b8c44f3760c1f5fbf4253f764c608767fdd3e28c 50bb028bf48eb2d4c9b264653c4d3d161a32c2cb
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Feb 15 05:49:20 2012 +0000

    Merge tag 'upstream/0.7'
    
    Upstream version 0.7


-- 
A Virtual Globe library