merge of '42098e571e50812e9146ed9ceaf3d271d88bca35'
authorMike Westerhof <mwester@dls.net>
Mon, 1 Jan 2007 20:52:25 +0000 (20:52 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 1 Jan 2007 20:52:25 +0000 (20:52 +0000)
commitb57cda852866051daff509b0100a37c367f9d255
tree116263240c85e186fdbbbbb7fb5f201304a17cc6
parentd6fbe65018f29f8f16391f67e822f9914bc3ac35
parent2f023367fe5d7fa9b705d3473ce655df5c95237c
Merge ... '42098e571e50812e9146ed9ceaf3d271d88bca35'
     and '748c040de910c5316366a67ae82394039392fb50'