merge of '227d9d1640e292b986196fbecfb628a17ffb9645'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Aug 2007 14:27:13 +0000 (14:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Aug 2007 14:27:13 +0000 (14:27 +0000)
     and '5522b4404c3b117f5b3f78bd8e0e0fe14321787b'


Trivial merge