]> err.no Git - util-linux/commit
Merge commit 'origin'
authorLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 17:47:10 +0000 (11:47 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 17:47:10 +0000 (11:47 -0600)
commitf1950e1b5550f7caa011325ccce32cdd01e673b5
tree522f69eca6590885739a92a7cf232b775809c146
parentff12ee2063443e9d85e01b4d146fba8d48d842df
parentc986042898867cf1b81dc134f75c6cdd4fea1a9b
Merge commit 'origin'

Conflicts:

configure.ac
configure.ac