Commit a4e2c36a66eca49ae4d7bdf0fdba8d4b3c900ab9

Edward Thomson 2014-04-23T19:40:21

merge: checkout default shouldn't clobber given