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)
commit180a7cc50ba32c83e6a05d3560850ba228d2afcb
tree19a6e93a415196f719f61f66b2966c986121267f
parentcf74fc1371db0ccfe351f6a33fba0eee32af9954
parent15cbdea4f1ffc12d2e7ac860d549475b9c8b7567
Merge branch 'master' of git://git.opensuse.org/projects/zypp/sat-solver

Conflicts:
package/libsatsolver.spec.in