[openlmi-providers/f19: 4/4] Merge branch 'master' into f19

[Radek Novacek]

commit 87e98e7173f4c1c1bd5d2dd5803758c4d246d0b6
Merge: 4487894 9849869
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Fri Jul 26 13:00:39 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	openlmi-providers.spec

 ...iders-konkretcmpi-0.9.1-new-generated-api.patch |   82 ++++++++++++++++++++
 openlmi-providers.spec                             |   11 +++-
 2 files changed, 92 insertions(+), 1 deletions(-)
---