[player: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/player

[rmattes]

commit dffd7c0a28cd93e33b3ee6ca9e7efc500d8db7b8
Merge: c49add7 5be65a6
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Jun 19 21:19:51 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/player
    
    Conflicts:
    	player.spec

 player-3.0.2.s390x.patch |   13 +++++++++++++
 player.spec              |    9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --cc player.spec
index d7c16d9,3256481..5deef02
--- a/player.spec
+++ b/player.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:           player
  Version:        3.0.2
--Release:        9%{?dist}
++Release:        10%{?dist}
  Summary:        Cross-platform robot device interface and server
  
  Group:          Applications/System
@@@ -214,9 -215,9 +216,12 @@@ rm -rf $RPM_BUILD_ROO
  %{ruby_sitearch}/*.so
  
  %changelog
- * Sun Jun 19 2011 Rich Mattes <richmattes at gmail.com> - 3.0.2-9
++* Sun Jun 19 2011 Rich Mattes <richmattes at gmail.com> - 3.0.2-10
 +- Rebuild for geos update
 +
+ * Wed May 04 2011 Dan Horák <dan[at]danny.cz> - 3.0.2-9
+ - Add s390x as 64-bit arch
+ 
  * Sun Apr 10 2011 Rich Mattes <richmattes at gmail.com> - 3.0.2-8
  - Rebuild for boost soname change