merge of '80401af978389dc31680f5749d9a6b066bbee542'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Dec 2007 22:36:52 +0000 (22:36 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Dec 2007 22:36:52 +0000 (22:36 +0000)
commit9da116be59a7a608285a0f16da7e9a31566b5ccb
treed85f70784fd882aaf30b901e60cdce5c9e48c518
parent4ecc73daa223da420e273e74cf8eff18a95d4a33
parent7181f2f12b9b48fa6666973da0e9c82ea9e57bd7
Merge ... '80401af978389dc31680f5749d9a6b066bbee542'
     and 'eb184b297334b4fd07df0787e5149d8be2c97b65'