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

[Luya Tshimbalanga]

commit 809859fa906532aed79943fc69c4f10987375e19
Merge: 41d155b b386618
Author: Luya Tshimbalanga <luya at muamba.TELUS1603>
Date:   Sat Nov 12 20:01:38 2011 -0800

    Merge branch 'master' into f14

 gdesklets-goodweather.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---