mock launcher changes checked into head of CVS