Merge branch 'master' of ssh://git@git.opensuse.org/projects/zypp/zypper

author Ján Kupec <jkupec@suse.cz>

Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)

committer Ján Kupec <jkupec@suse.cz>

Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)
author Ján Kupec <jkupec@suse.cz>
Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)
committer Ján Kupec <jkupec@suse.cz>
Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)
diff --cc src/solve-commit.cc
Simple merge
diff --cc zypper.spec.cmake
Simple merge
author	Ján Kupec <jkupec@suse.cz>
	Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)
committer	Ján Kupec <jkupec@suse.cz>
	Thu, 9 Jul 2009 10:17:22 +0000 (12:17 +0200)
		1	2
src/solve-commit.cc	patch \|	diff1 \|	diff2 \|	blob \| history
zypper.spec.cmake	patch \|	diff1 \|	diff2 \|	blob \| history