[libsolv/f20: 2/2] Merge branch 'master' into f20

[Zdeněk Pavlas]

commit a342e581110f9b0cc488355f7658cdea9b329286
Merge: b86b823 a0370de
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Fri Nov 22 16:33:40 2013 +0100

    Merge branch 'master' into f20

 .gitignore   |    1 +
 libsolv.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc libsolv.spec
index be80c9d,d53da4b..224f0bc
--- a/libsolv.spec
+++ b/libsolv.spec
@@@ -153,8 -153,11 +153,11 @@@ rm $RPM_BUILD_ROOT/usr/bin/testsol
  %{python_sitearch}/*
  
  %changelog
+ * Fri Nov 22 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.4.0-2.git4442b7f
+ - Rebase to 0.4.0, upstream commit 4442b7f.
+ - support DELTA_LOCATION_BASE for completeness
  
 -* Mon Oct 29 2013 Aleš Kozumplík <akozumpl at redhat.com> - 0.4.0-1.gitd49d319
 +* Tue Oct 29 2013 Aleš Kozumplík <akozumpl at redhat.com> - 0.4.0-1.gitd49d319
  - Rebase to 0.4.0, upstream commit d49d319.
  
  * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 0.3.0-9.gita59d11d