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)
Conflicts:
package/libsatsolver.spec.in


Trivial merge