[etoys/f14/master: 2/2] Merge branch 'master' into f14

[Peter Robinson]

commit 6e8f3da92a4dfbc5117603f66c0d2e793555960b
Merge: 0d0c2ab d9a431d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 29 14:53:00 2010 +0100

    Merge branch 'master' into f14

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