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

[Dan Mashal]

commit b86395950c6e10b9f79c854e630cabba4618869b
Merge: 7833fbf 247d5a8
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 26 21:29:07 2012 -0700

    Merge branch 'master' into f18

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