merge of '3421ff70666434c0c8110de81d4810e43ef46a69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:47:17 +0000 (01:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:47:17 +0000 (01:47 +0000)
     and '7740f57201d1a3339463ab6ee1a56af6dbbd5b7a'


Trivial merge