Partial merge revision 219 of "/trunk/logbook"