[SCM] A weather monitoring program branch, master, updated. upstream/0.4.2-6-g3ffac30

[Andy Spencer]

The following commit has been merged in the master branch:
commit dd06c170df04807775d87d581ca2cd878ea5faea
Merge: 9479c0b21d74d77cbaf74efb76f08b3289b99f37 ae697f162efc06b182f8f5b3cf4ee82c5498c5c8
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Sun Jun 19 23:27:19 2011 +0000

    Merge commit 'upstream/0.5'


-- 
A weather monitoring program