[openlmi-providers/f18: 6/6] Merge branch 'f19' into f18

[Radek Novacek]

commit fbb1da52eb83aebf570cc3f86c75a9e6b1989956
Merge: b807e78 87e98e7
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Fri Jul 26 13:12:34 2013 +0200

    Merge branch 'f19' into f18
    
    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(-)
---