r22401: Add bzr revision+nick support to mkversion.sh.