merge of '386f054189c8baaee86e3bd28d60abe9c7bbd49f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 May 2007 17:01:37 +0000 (17:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 May 2007 17:01:37 +0000 (17:01 +0000)
     and 'c03cc3e57ade4e24200269ffc91fd0910b4093b0'


Trivial merge