merge of 7ec369fda75af141429df5f12e02b43d815f6515
authorRod Whitby <rod@whitby.id.au>
Sun, 21 May 2006 01:41:12 +0000 (01:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 01:41:12 +0000 (01:41 +0000)
     and abf00cce624bf75483d805556b1219a4bb3638c5


Trivial merge