Commit f79c6780c309d76aebf80fffc76edf7ada3d39fe

William Pitcock 2011-07-25T00:19:55

main: add pkg_queue for mergemaster operation