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

[Rex Dieter]

commit d9f2ec63fb52e7948abf2c9719654ba88edfba2b
Merge: 6c36633 5f22ca8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 07:49:46 2012 -0500

    Merge branch 'master' into f17

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