Merge
commitf7c381488fb1d110930f85bacdedf7ee0873a552
authorg@localhost.localdomain <g@localhost.localdomain>
Fri, 30 Jun 2006 20:31:16 +0000 (30 22:31 +0200)
committerg@localhost.localdomain <g@localhost.localdomain>
Fri, 30 Jun 2006 20:31:16 +0000 (30 22:31 +0200)
tree50431cc35fc5fc30bdce8dea543c37246da84778
parent6c73a73f97260b529f8f1b0ac88a668dbc139839
parent4ed14657780de79073148f67b30d3deb5aaab109
Merge