merge of '74ea59538dca8f50c67da30a5d22c12d4be0a29f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jun 2007 22:26:56 +0000 (22:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jun 2007 22:26:56 +0000 (22:26 +0000)
     and '7695b52b6fd3e3c9802eead22d39f996533773a4'


Trivial merge