[akonadi/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 33fd8bb5f66feca0276f7d2bd06d654699603323
Merge: 35af2fd d28f28f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 15 09:55:31 2012 -0500

    Merge branch 'f17' into f16

 akonadi-cleanup_orphan_resources.patch |  114 ++++++++++++++++++++++++++++++++
 akonadi.spec                           |   12 +++-
 2 files changed, 125 insertions(+), 1 deletions(-)
---