merge of '8e186034e744815050d62541776a4d037e5d320a'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 21 Jan 2008 01:16:05 +0000 (01:16 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 21 Jan 2008 01:16:05 +0000 (01:16 +0000)
commit062191f4b3c233dcfe1c83e60676a9a117f7858f
treec98dabd6bd6ec00b84580144763e01591caf349c
parent6483b4b4933940206ff5574926e00b7c08e45e34
parentec293c5c0601f230f74e1d2e0212cfddaa009450
Merge ... '8e186034e744815050d62541776a4d037e5d320a'
     and 'eed8e44709b0135c476bb86fd537e46917805a76'