Merge branch 'master' into python

Conflicts:
	make.sh

config/rootfiles/packages/libsatsolver

@@ -0,0 +1,52 @@
+#usr/include/satsolver
+#usr/include/satsolver/bitmap.h
+#usr/include/satsolver/chksum.h
+#usr/include/satsolver/dirpool.h
+#usr/include/satsolver/evr.h
+#usr/include/satsolver/hash.h
+#usr/include/satsolver/knownid.h
+#usr/include/satsolver/md5.h
+#usr/include/satsolver/policy.h
+#usr/include/satsolver/pool.h
+#usr/include/satsolver/pool_fileconflicts.h
+#usr/include/satsolver/poolarch.h
+#usr/include/satsolver/poolid.h
+#usr/include/satsolver/pooltypes.h
+#usr/include/satsolver/poolvendor.h
+#usr/include/satsolver/problems.h
+#usr/include/satsolver/queue.h
+#usr/include/satsolver/repo.h
+#usr/include/satsolver/repo_content.h
+#usr/include/satsolver/repo_deb.h
+#usr/include/satsolver/repo_deltainfoxml.h
+#usr/include/satsolver/repo_helix.h
+#usr/include/satsolver/repo_products.h
+#usr/include/satsolver/repo_releasefile_products.h
+#usr/include/satsolver/repo_repomdxml.h
+#usr/include/satsolver/repo_rpmdb.h
+#usr/include/satsolver/repo_rpmmd.h
+#usr/include/satsolver/repo_solv.h
+#usr/include/satsolver/repo_susetags.h
+#usr/include/satsolver/repo_updateinfoxml.h
+#usr/include/satsolver/repo_write.h
+#usr/include/satsolver/repo_zyppdb.h
+#usr/include/satsolver/repodata.h
+#usr/include/satsolver/repopage.h
+#usr/include/satsolver/rules.h
+#usr/include/satsolver/sat_xfopen.h
+#usr/include/satsolver/satversion.h
+#usr/include/satsolver/sha1.h
+#usr/include/satsolver/sha2.h
+#usr/include/satsolver/solvable.h
+#usr/include/satsolver/solver.h
+#usr/include/satsolver/solverdebug.h
+#usr/include/satsolver/strpool.h
+#usr/include/satsolver/tools_util.h
+#usr/include/satsolver/transaction.h
+#usr/include/satsolver/util.h
+usr/lib/libsatsolver.so
+usr/lib/libsatsolver.so.0
+usr/lib/libsatsolver.so.0.16
+usr/lib/libsatsolverext.so
+usr/lib/libsatsolverext.so.0
+usr/lib/libsatsolverext.so.0.16