bzr revid: mra@mra-laptop-20101222112024-yt47p2bd7kwvcqwy bzr revid: mra@mra-laptop-20101223041057-w5s862hm3fajcqkr