merge of '7ce845adf550b64d9d2250d29acf1667cf40a689'
authorMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 23:39:36 +0000 (23:39 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 23:39:36 +0000 (23:39 +0000)
commitd022fe0250decd5421912d432c7ec4ca38ac0c0c
treeb3bbb847adf7aa5fe20325a44507d4dc2a4dc007
parent06009a026a3aed63e7bcf08daa88f6b0117318dd
parent86f3d937166783d7824e4cae2da720b6706f6898
Merge ... '7ce845adf550b64d9d2250d29acf1667cf40a689'
     and 'e2163ec9cea6469b87297219312db5af82e6b960'