[libmateweather/f16: 3/3] Merge branch 'master' into f16

[Dan Mashal]

commit 3b728fc314aa121a093a430aad1c8fb782311dae
Merge: 7622ed3 43122c7
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Nov 25 16:19:24 2012 -0800

    Merge branch 'master' into f16

 libmateweather.spec |   79 +++++++++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 36 deletions(-)
---