[mate-notification-daemon/f16: 13/13] Merge branch 'master' into f16

[Dan Mashal]

commit 087df5486660aa22c422981d0e42615f5d78d886
Merge: 969cd3f 25d8e37
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Nov 25 18:31:46 2012 -0800

    Merge branch 'master' into f16

 .gitignore                    |    1 +
 mate-notification-daemon.spec |  102 +++++++++++++++++++++++++---------------
 sources                       |    2 +-
 3 files changed, 66 insertions(+), 39 deletions(-)
---