merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
authorJamie Lenehan <lenehan@twibble.org>
Mon, 3 Jul 2006 02:45:37 +0000 (02:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 02:45:37 +0000 (02:45 +0000)
     and 7847e7c8b41faf980a8a08156c7c8a5bc616f814


Trivial merge