merge of '1881f1e08c19772afb57e141b8e9cfe8a3308a4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:10:41 +0000 (16:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:10:41 +0000 (16:10 +0000)
     and '72c0842d7283ea3030501853bf33285caffa427c'


Trivial merge