[akonadi/f13/master: 17/17] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit d8f044d2afd64a3cb276a4efc4611abdf4cec5e2
Merge: 2d16b86 6028fdf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 15:48:35 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	akonadi.spec

 .gitignore                                         |    2 +-
 akonadi-1.3.1-mysql_update_backport.patch          |   69 ----------------
 ....1-mysql_conf.patch => akonadi-mysql_conf.patch |    9 +-
 akonadi-svn_checkout.sh                            |   15 ++++
 akonadi.spec                                       |   87 ++++++++++++++++----
 sources                                            |    2 +-
 6 files changed, 93 insertions(+), 91 deletions(-)
---