[etoys/f14/master: 4/4] fix merge conflicts

[Peter Robinson]

commit 0d0c2ab1bd28a03de4c306e51e4f5b839fd0d230
Merge: e24ee3c c30ec21
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 22 12:08:14 2010 +0100

    fix merge conflicts

 .gitignore |    1 +
 etoys.spec |   11 +++++++----
 sources    |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc etoys.spec
index c36b0b0,381a22f..40f7886
--- a/etoys.spec
+++ b/etoys.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:           etoys
- Version:        4.0.2340
- Release:        2%{?dist}
+ Version:        4.1.2387
+ Release:        1%{?dist}
++
  Summary:        A media-rich model, game, and simulation construction kit and authoring tool
  Vendor:         Viewpoints Research