[MERGE] Fix two oversights in _dirstate_helpers_c.pyx

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1afaf6160810041005q2dd2b33cjd9091f69d76bb0a7%40mail.gmail.com%3E
Project: Bazaar