[gdesklets-goodweather/f14: 4/4] Merge branch 'master' into f14

[Luya Tshimbalanga]

commit 41d155be3a3e89f64890072be2e81f3d791930f9
Merge: 7e51dc3 e82355f
Author: Luya Tshimbalanga <luya at muamba.TELUS1603>
Date:   Mon Nov 7 12:03:17 2011 -0800

    Merge branch 'master' into f14
    
    Conflicts:
    	gdesklets-goodweather.spec

 __init__.py.patch          |  141 ++++++++++++++++++++++++++++++++++++++++++++
 gdesklets-goodweather.spec |   18 +++++-
 weather.patch              |   11 ++++
 3 files changed, 167 insertions(+), 3 deletions(-)
---