merge of '21f8954c91db09af224e09720b99300cf59e6c65'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 15:16:10 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 15:16:10 +0000 (15:16 +0000)
     and '854acfaab8d96ab47cd255ca4449000af3e97e99'


Trivial merge