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

[Luya Tshimbalanga]

commit e3ae0a9562b4ca51e1f6d2b454e98b8719b3ba66
Merge: 031daa1 81ab946
Author: Luya Tshimbalanga <luya at muamba.TELUS1603>
Date:   Sat Nov 12 20:25:45 2011 -0800

    Merge branch 'master' into f14

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