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

[Peter Robinson]

commit 181379c4c87bbbcdd8406e28b7674627e7833ae0
Merge: 6e8f3da fa83659
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 14 15:06:11 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 1afaf9c,af74781..03cb4a7
--- a/etoys.spec
+++ b/etoys.spec
@@@ -1,7 -1,6 +1,7 @@@
  Name:           etoys
- Version:        4.1.2388
+ Version:        4.1.2390
  Release:        1%{?dist}
 +
  Summary:        A media-rich model, game, and simulation construction kit and authoring tool
  Vendor:         Viewpoints Research