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

[Dan Mashal]

commit 1d18440886db6b7eedded7c826e25ca8f26f984e
Merge: 087df54 0f35cf9
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Jan 20 16:45:21 2013 -0600

    Merge branch 'master' into f16

 .gitignore                    |    1 +
 mate-notification-daemon.spec |   49 +++++++++++++++++++++++-----------------
 sources                       |    2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)
---