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

[Dan Mashal]

commit efda7940bc85b7646e21afb95b507ec675784cce
Merge: 9965671 235a6cc
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat Sep 15 20:29:20 2012 -0700

    Merge branch 'master' into f17

 mate-notification-daemon.spec |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
---