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

[Rex Dieter]

commit 89978d34a13a587685fa10979774acc39bd133d9
Merge: b863959 5f22ca8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 07:49:17 2012 -0500

    Merge branch 'master' into f18

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