[sugar: 2/2] fix merge

[Peter Robinson]

commit 8b2fb6ed242bec1a890691b0e84a1c2448f62064
Merge: 8d1da45 0c45722
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 14 19:04:16 2012 +0000

    fix merge

 sugar.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc sugar.spec
index 4953745,712b4e6..e8eddcf
--- a/sugar.spec
+++ b/sugar.spec
@@@ -145,9 -146,9 +146,12 @@@ f
  %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
  
  %changelog
 +* Wed Mar 14 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.95.5-1
 +- devel release 0.95.5
 +
+ * Tue Mar  6 2012 Daniel Drake <dsd at laptop.org> - 0.95.4-2
+ - Add dependency on sugar-toolkit-gtk3 (needed to launch activities)
+ 
  * Thu Feb  2 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.95.4-1
  - devel release 0.95.4