Code

Merge "two fixes for fast-import's 'ls' command" from Jonathan