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

[Rex Dieter]

commit ae522cc95b716323edef4bdfe35196d150468aa4
Merge: 9e63206 6028fdf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 19 14:40:11 2010 -0500

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

 akonadi.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---