Merge branch 'master' of git://git.opensuse.org/projects/zypp/sat-solver
authorStephan Kulow <coolo@suse.de>
Mon, 31 Aug 2009 11:13:34 +0000 (13:13 +0200)
committerStephan Kulow <coolo@suse.de>
Mon, 31 Aug 2009 11:13:34 +0000 (13:13 +0200)
commita965ee726a63ba8993237a2147a4d4832166745c
treeebfd609c5ccfa0e21327b4bf19852b178b010c0e
parentab7af0af6604ab82fd506bb9828db1b4f766bbb8
parent13bddfc389b448d8463eb273ea6538e9dccab802
Merge branch 'master' of git://git.opensuse.org/projects/zypp/sat-solver

Conflicts:
package/libsatsolver.spec.in