[syncevolution/f16: 7/8] Merge branch 'master' into f16

[Peter Robinson]

commit 15b4f37c345ea5e9c708561915f1f9b93a8a0205
Merge: b84ed13 2d57702
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 13 13:40:40 2011 +0100

    Merge branch 'master' into f16

 .gitignore                          |    1 +
 sources                             |    2 +-
 syncevolution-1.99.7-fixbuild.patch |   12 ++++++++++++
 syncevolution.spec                  |   29 +++++++++++++++++++----------
 4 files changed, 33 insertions(+), 11 deletions(-)
---