[SCM] A weather monitoring program branch, master, updated. upstream/0.5-17-gc11b4a1

[Andy Spencer]

The following commit has been merged in the master branch:
commit cb5cf4e61f185c780ec81bc2b2c39d8698ffbbad
Merge: 5190b13ee79cca6e019dcb480dbd50afa973b602 6c5ab65b7601fc8dd9b266f2c1eb7e49eda9462f
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Aug 24 17:48:38 2011 +0000

    Merge commit 'upstream/0.5.1'


-- 
A weather monitoring program