merge of '0186939e5675c48f3e8ee1c853bd816dcc4a15a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 12:44:06 +0000 (12:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Oct 2007 12:44:06 +0000 (12:44 +0000)
     and '8c39fbcad580dce7b65af91c3db4a99f9d0ba40b'


Trivial merge