merge of '24bae19acc08cfef78544f0893bc16d124a3f204'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:51:54 +0000 (17:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:51:54 +0000 (17:51 +0000)
commit89c29837788a5ded6c71ce3f834fe3f8e7a9cba0
treeddc32a0a28706621c8a21923297036b909b8cece
parent01699d54e835aca39c96dc2edf8bdc6ca4afadcb
parent4245e6a3732548a37bc3497fd55045744f054e48
Merge ... '24bae19acc08cfef78544f0893bc16d124a3f204'
     and 'a3b18a00a09e716f4b3d5bfced86fea0439953a0'