merge of '09c9ae46a929db4ad083caeb38025cd7068a7668'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:23:17 +0000 (14:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:23:17 +0000 (14:23 +0000)
     and 'b5af291fa9dc074af84727684ddae1efa9c1be0d'


Trivial merge