merge of '93275fa73551aabe0b186dde99fd16be158043ab'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 20:57:09 +0000 (20:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 20:57:09 +0000 (20:57 +0000)
     and 'eed8dc866370e81bc5849ef5b2ddfeb8e87d4f1c'


Trivial merge