[xmlrpc3/f17: 3/3] Merge branch 'master' into f17

[Stanislav Ochotnicky]

commit 92bcc3cb58665d5ff2c50c39d4b7da46213c3638
Merge: 88612b6 93b074e
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed May 9 18:38:59 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	xmlrpc3.spec

 xmlrpc3.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---