[libkgapi/f18: 7/7] Merge branch 'master' into f18

[Daniel Vrátil]

commit 5a4dd12c55969ea180732b6ce472a561fe964ead
Merge: 6110420 2edfc68
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed May 22 13:48:21 2013 +0200

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	libkgapi.spec
    	sources

 .gitignore    |    4 ++--
 libkgapi.spec |   39 +++++++++++++++++++++++++--------------
 sources       |    2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)
---
diff --cc .gitignore
index 9aaefe6,7f67945..b42b1b7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,5 +1,3 @@@
--/libkgapi-0.4.1.tar.bz2
--/libkgapi-0.4.2.tar.bz2
+ /libkgapi-0.4.3.tar.bz2
  /libkgapi-0.4.4.tar.bz2
+ /libkgapi-2.0.0.tar.bz2