[sugar-clock/f14: 4/4] fix merge

[Peter Robinson]

commit 15a83cad3ab44536b9befaae6e790726907a856f
Merge: dc8a8b5 21fdd79
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jun 5 00:27:45 2011 +0100

    fix merge

 .gitignore       |    1 +
 sources          |    2 +-
 sugar-clock.spec |   18 +++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)
---