merge of 975b96916690358f4a6cab8fbb7308fce112d311
authorJamie Lenehan <lenehan@twibble.org>
Mon, 3 Jul 2006 03:29:47 +0000 (03:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 03:29:47 +0000 (03:29 +0000)
     and b97ad46b88a01ddecefed222491f15a9b1ba45c9


Trivial merge