[pympdtouchgui: 4/4] Merge changes from F13 branch.

[Adam Tkac]

commit 12acdcca2bdf0d9412f39eefe6b560455c4a51cc
Merge: aa45894 2e52319
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Aug 24 11:19:12 2010 +0200

    Merge changes from F13 branch.
    
    - merge following changes from F13 branch [Sven Lankes]
      - New upstream release
      - remove upstreamed setup.py patch
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	pympdtouchgui.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                 |    2 +-
 pympdtouchgui-config.patch |   11 +++++++++++
 pympdtouchgui-setup.patch  |   12 ------------
 pympdtouchgui.spec         |   16 ++++++++++------
 sources                    |    2 +-
 5 files changed, 23 insertions(+), 20 deletions(-)
---
diff --cc pympdtouchgui.spec
index 6b7a1fd,e9e30a7..6b3adaa
--- a/pympdtouchgui.spec
+++ b/pympdtouchgui.spec
@@@ -63,8 -62,9 +62,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Thu Feb 25 2010 Sven Lankes <sven at lank.es> - 0.327-1
 -- New upstream release
 -- remove upstreamed setup.py patch
++* Tue Aug 24 2010 Adam Tkac <atkac redhat com> - 0.327-1
++- merge following changes from F13 branch [Sven Lankes]
++  - New upstream release
++  - remove upstreamed setup.py patch
++
 +* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.325-2
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
  
  * Wed Feb 10 2010 Sven Lankes <sven at lank.es> - 0.325-1
  - New upstream release