[cura-providers/f18: 6/6] Merge branch 'master' into f18

[Michal Minar]

commit 1874603866051fc0dbcef1ec86f6d505ac492c67
Merge: 5867eb6 e5f88d9
Author: Michal Minar <miminar at redhat.com>
Date:   Sun Oct 7 21:53:17 2012 +0200

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	cura-providers.spec
    	sources

 .gitignore          |    2 +
 cura-providers.spec |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sources             |    2 +-
 3 files changed, 75 insertions(+), 1 deletions(-)
---
diff --cc cura-providers.spec
index f223bb2,4940339..3cd8742
--- a/cura-providers.spec
+++ b/cura-providers.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:           cura-providers
++<<<<<<< HEAD
 +Version:        0.0.5
++=======
+ Version:        0.0.8
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        Set of basic CIM providers