[childsplay/f13: 8/8] Merge branch 'f14' into f13

[Jon Ciesla]

commit 54a246ccc8cbf03046e63e15dabe04ce053759c9
Merge: ba1a2b8 e424fec
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Jun 3 09:04:00 2011 -0500

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	childsplay.spec
    	sources

 .gitignore            |    2 ++
 childsplay.README.RPM |   33 ---------------------------------
 childsplay.spec       |   41 +++++++++++++++++++++++++++++++++++------
 sources               |    2 +-
 4 files changed, 38 insertions(+), 40 deletions(-)
---
diff --cc .gitignore
index d122516,60a8cc1..1b3b05b
--- a/.gitignore
+++ b/.gitignore
@@@ -15,3 -15,4 +15,5 @@@ alphabet_sounds_ru-0.9.1.tg
  alphabet_sounds_sl-0.9.1.tgz
  alphabet_sounds_sv-0.9.1.tgz
  childsplay-1.5.1.tgz
+ /childsplay-1.6.tgz
++