manual merge of the 'fixprinter' branch from c2c ('bzr merge' failed :( )