merge of '0289d89398deea4654115c70fb33322c5aea435e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 22:24:10 +0000 (22:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 22:24:10 +0000 (22:24 +0000)
     and 'bb36d08ccdb518fc32365dbed19d9d236d737b5f'


Trivial merge