commit c077d19012f28b3bf7722de85383e733e8138956 Merge: 7074410 81ab946 Author: Luya Tshimbalanga <luya at muamba.TELUS1603> Date: Sat Nov 12 20:25:30 2011 -0800 Merge branch 'master' into f16 gdesklets-goodweather.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---