Mercurial won't version control empty directories, how annoying.
Fix two bugs (of many) identified by Coverity. I want to see if the scanned defect count goes from 119 to 117.