merge revision 236 of "/trunk/logbook"