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

[Luya Tshimbalanga]

commit 7074410ebf437ff1b13984e5c0faee0233cae49b
Merge: dde72a9 5d6dfc0
Author: Luya Tshimbalanga <luya at muamba.TELUS1603>
Date:   Sat Nov 12 20:15:04 2011 -0800

    Merge branch 'master' into f16

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