[xmlrpc-c/f16: 2/2] Merge remote-tracking branch 'origin/master' into f16

[ensc]

commit 4ca55d6112b360a141f9ba3c39493b036c229c80
Merge: 4f60fe2 bf23117
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sat Aug 27 12:05:36 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	xmlrpc-c.spec

 .gitignore           |    1 +
 lastver              |    2 +-
 sources              |    2 +-
 xmlrpc-c-cmake.patch |    2 +-
 xmlrpc-c.spec        |    9 ++++++---
 5 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc xmlrpc-c.spec
index e7335a3,7c0d4f6..4bbe91a
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@@@ -5,8 -5,8 +5,8 @@@
  
  Summary:	A lightweight RPC library based on XML and HTTP
  Name:		xmlrpc-c
- Version:	1.27.4
- Release:	%release_func 1601.svn%svnrev
+ Version:	1.27.5
 -Release:	%release_func 1700.svn%svnrev
++Release:	%release_func 1600.svn%svnrev
  # See COPYING for details.
  # The Python 1.5.2 license used by a few files is just BSD.
  License:	BSD and MIT
@@@ -237,13 -235,13 +237,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Sat Aug 27 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.5-1700.svn2185
++* Sat Aug 27 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.5-1600.svn2185
+ - updated to 1.27.5
+ 
 -* Sun Aug  7 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.4-1700.svn2171
 +* Mon Aug  8 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.4-1601.svn2171
 +- rebuilt with correct check for libcurl-devel
 +
 +* Sun Aug  7 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.4-1600.svn2171
  - updated to 1.27.4
  
 -* Sun Aug  7 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.3-1700.svn2145
 +* Sun Aug  7 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.3-1600.svn2145
  - updated to 1.27.3
  
  * Mon Jun 27 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.0-1600.svn2145