merge of '4fa7627848aee19c170697491ca6e335fa384d4c'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 4 Apr 2007 23:08:15 +0000 (23:08 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 4 Apr 2007 23:08:15 +0000 (23:08 +0000)
commit64a8af80d3f598b8c31dd3d9f2d4c5968e53c797
tree4745a5dbd97326c4c1f30db138e4bb6067a4400c
parentcd0eba2a4ed708a7439b36b3b2f0fef0eb451da2
parentad96365837fb18c9517b5c9399526869165b7ec2
Merge ... '4fa7627848aee19c170697491ca6e335fa384d4c'
     and 'e7b9bfc9b152c5457d9862001f03014f79bbfea1'