merge with stable

dirstate: fix case-folding identity for traditional Unix We used to use os.path.normcase which was a no-op, which was unhelpful for cases like VFAT on Linux.

convert/bzr: fix test of divergent nested renames for bzr 1.x 54c0517c0fe8 introduced a new block in test-convert-bzr-directories.t which produces a slightly different output with older bzr versions. Tested with bzr 1.5 on Debian lenny.

phases: set common changeset to public on pull

phases: mark content pushed as public in local repo on push

phases: marked content of a changegroup as published

phases: set new commit in 1-phase