merge of '34eba82d1cb76098c919175dd3aadc90f75bde51'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 14:09:03 +0000 (14:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 14:09:03 +0000 (14:09 +0000)
     and '8d2677d5052d987d6cfa14c33f81a8e0b35a2c62'


Trivial merge