merge of '6575450c9bef6aefe7c3b10ab9283aa7cd6e7a99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:48:40 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:48:40 +0000 (16:48 +0000)
     and '8ea08a21760e2ca7c95e47e532192a9c4566cd3f'


Trivial merge