[akonadi/f14/master: 17/17] Merge remote-tracking branch 'origin/master' into f14

[Rex Dieter]

commit 33349bf0e99f2decdb0b0af6c528c921d8ed9ab5
Merge: c6e0358 8aacc0e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 14 08:09:14 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	akonadi.spec
    	sources

 .gitignore              |    3 +-
 akonadi-svn_checkout.sh |   15 ---------
 akonadi.spec            |   78 +++++++++++++++++++++++++++++------------------
 sources                 |    2 +-
 4 files changed, 50 insertions(+), 48 deletions(-)
---