# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2009-04-29 16:36:55
# Node ID cb08c3765a020d55861bea02df13b0f6d08b5a7e
# Parent  dd1b47e17d7eba4aaa2cce2e442669bb80528b51
# Parent  aee8455ee8ec49d0e15a3154df625f5db559dc51

merge with crew-stable

I pushed the dd1b47e17d7e to crew before realizing that it would also
be suitable for crew-stable, hence the double changeset.