merge revision 223 of "/trunk/logbook"