[MERGE] make ls non-recursive by default

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49CB8701.8000808%40internode.on.net%3E
Project: Bazaar