[syncevolution/f16: 3/3] fix merge

[Peter Robinson]

commit b84ed13bc7247aac645118c5985b6e43e283462e
Merge: 6ff238d 2eba688
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Aug 18 22:24:43 2011 +0100

    fix merge

 .gitignore         |    1 +
 sources            |    2 +-
 syncevolution.spec |   71 +++++++++++++++++++++++++++------------------------
 3 files changed, 40 insertions(+), 34 deletions(-)
---