Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.

test-webraw: do not store hostname in test output

str.rsplit does not exist in python 2.3

Merge with crew.