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

[Dan Mashal]

commit 6c36633c33e0d0a1c66aedd3a42c4d704586198d
Merge: 14c450a 247d5a8
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 26 21:29:38 2012 -0700

    Merge branch 'master' into f17

 mate-notification-daemon.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---