[sugar-pippy: 2/2] fix merge

[Peter Robinson]

commit 1b105af29cfc188be288c07d5be64968dbfb44df
Merge: cac3cee 54a28e2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Feb 17 11:36:07 2012 +0000

    fix merge

 sugar-pippy.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc sugar-pippy.spec
index d376ec0,5b5408f..678bd49
--- a/sugar-pippy.spec
+++ b/sugar-pippy.spec
@@@ -57,9 -57,9 +57,12 @@@ don
  
  
  %changelog
 +* Fri Feb 17 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 45-1
 +- Release 45
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 44-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sat Dec 10 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 44-1
  - Release 44