[dnf: 2/2] merge from f18

[Ales Kozumplik]

commit d24102ec1c1a2aad0f80c0095694a81161c4a5f1
Merge: 19ebbf3 ecf949b
Author: Ales Kozumplik <ales at redhat.com>
Date:   Sat Jan 19 10:52:49 2013 +0100

    merge from f18

 .gitignore |    1 +
 dnf.spec   |   13 ++++++++++---
 sources    |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 954622c,49b42b8..9ec7e1f
--- a/.gitignore
+++ b/.gitignore
@@@ -11,7 -11,5 +11,8 @@@
  /dnf-ea72d9a.tar.xz
  /dnf-4831982.tar.xz
  /dnf-5d85f6b.tar.xz
 +/dnf-9f050eb.tar.xz
  /dnf-6a055e6.tar.xz
 +/dnf-3701ad6.tar.xz
 +/dnf-b901926.tar.xz
+ /dnf-dec970f.tar.xz