[mail-notification/f17: 4/4] Merge branch 'master' into f17

[epienbro]

commit 0ceec864bc7104833b5985ac569068e8473ea88a
Merge: 643e30a b732e43
Author: Erik van Pienbroek <erik at vanpienbroek.nl>
Date:   Wed Mar 21 00:13:35 2012 +0100

    Merge branch 'master' into f17

 mail-notification-5.4-evolution.patch |    3 ++-
 mail-notification.spec                |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---