merge of a9390448d82c08088c9697046e14075f0c439840
authorRod Whitby <rod@whitby.id.au>
Tue, 11 Apr 2006 06:34:00 +0000 (06:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 06:34:00 +0000 (06:34 +0000)
     and d93900aa884b52d778b478749eeafadb6bef3a21


Trivial merge