[syncevolution/f16: 4/4] Merge branch 'master' into f16

[Peter Robinson]

commit 26f2c851a713881db1b59a91608b77e8213f8a69
Merge: 5a47e08 36f03cf
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 17 12:47:44 2011 +0100

    Merge branch 'master' into f16

 .gitignore         |   10 +---------
 sources            |    2 +-
 syncevolution.spec |   11 +++++++----
 3 files changed, 9 insertions(+), 14 deletions(-)
---