[SCM] A weather monitoring program branch, master, updated. upstream/0.6-25-g87199be

[Andy Spencer]

The following commit has been merged in the master branch:
commit f039c3001422b9525a799d2d344c0849b937cf8b
Merge: 0c4870dadab71804ce5e803441a71516ccbefbf2 5abbb634009b9386c126df9204287531f9e39861
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Fri Nov 25 07:12:44 2011 +0000

    Merge commit 'upstream/0.6.1'


-- 
A weather monitoring program