merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
authorJamie Lenehan <lenehan@twibble.org>
Sat, 27 May 2006 23:03:13 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 23:03:13 +0000 (23:03 +0000)
     and faf532c4c96ee2f44be6339cdc67fc8f9be0d0ac


Trivial merge