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

[Rex Dieter]

commit 90a34e3032cebdaa4065bc96315721ed9aa2204c
Merge: 242fd6c c6e0358
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 7 07:49:00 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore                                         |    1 +
 ...server-1.4.0-remove-sqlite-version-assert.patch |   11 -----------
 akonadi.spec                                       |   16 +++++++++-------
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)
---