[sugar-stopwatch/f17: 4/4] fix merge

[Peter Robinson]

commit 0ca96b720b88131f6bd509d8a8fd1e0195973f0f
Merge: 2d69702 752b8d7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun May 27 17:09:47 2012 +0100

    fix merge

 .gitignore           |    2 ++
 sources              |    2 +-
 sugar-stopwatch.spec |    5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
---