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

[Rex Dieter]

commit 35af2fd8a992e15360ec3ccc50086ed1bef6dde2
Merge: b937209 6d49631
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 16:38:18 2012 -0600

    Merge branch 'master' into f16
    
    Conflicts:
    	akonadi.spec

 .gitignore   |    3 ++-
 akonadi.spec |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 sources      |    2 +-
 3 files changed, 48 insertions(+), 12 deletions(-)
---