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

[Peter Robinson]

commit d934c7b4216da94c7aa2e9dbcff7366d7cf2cc77
Merge: 26f2c85 6a13fb2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 18 14:36:54 2011 +0100

    Merge branch 'master' into f16

 syncevolution.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---