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

[Luya Tshimbalanga]

commit 031daa187c938890b2ef6928911f524072004218
Merge: 809859f 5d6dfc0
Author: Luya Tshimbalanga <luya at muamba.TELUS1603>
Date:   Sat Nov 12 20:15:25 2011 -0800

    Merge branch 'master' into f14

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