[openlmi-networking/f20: 2/2] Merge branch 'master' into f20

[Jan Šafránek]

commit 1939be702a47d6155e819c011f4b53e73e7ff63c
Merge: 922cd1e 9c48316
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Nov 15 09:15:21 2013 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	openlmi-networking.spec

 .gitignore              |    1 +
 openlmi-networking.spec |   13 ++++++++-----
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc openlmi-networking.spec
index 6b447af,c00847d..05911c6
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@@ -31,11 -30,8 +30,11 @@@ Requires:       python
  # sblim-sfcb or tog-pegasus
  Requires:       cim-server
  # Require openlmi-providers because of registration scripts
- Requires:       openlmi-providers >= 0.1.0
+ Requires:       openlmi-providers >= 0.4.1
  
 +# Get rid of this patch once theme is available
 +Patch0:         openlmi-networking-0.2.0-use-default-theme.patch
 +
  %description
  %{name} is set of CMPI providers for network management using
  Common Information Model (CIM).