merge of 0b04419bb0c1057c44d662dcafecc131e7ad93f5
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Jul 2005 10:38:03 +0000 (10:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jul 2005 10:38:03 +0000 (10:38 +0000)
     and 9a6d9077bf6279d2655773b30d7bf89f049d1ce6


Trivial merge