[akonadi/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit c22a02c2ffdfdb2721b2e2dffc3df19a20ec9905
Merge: 33fd8bb 089d628
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Mar 31 19:17:21 2012 -0500

    Merge branch 'master' into f16

 .gitignore   |    2 +-
 akonadi.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---