merge of '0308024e7a88007651ed3a14db106a00b69b32a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jul 2008 07:36:52 +0000 (07:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jul 2008 07:36:52 +0000 (07:36 +0000)
commit2fb69c3c0aa21da35060298c2ce875caba0004a0
treed32eaf1b0a11d9b7557ab8d02f55388337a76a4f
parent31de720064930a076ef2c4521d03b3c066b3a5f9
parent2fd1bd8160c4a93bb1811aedc2e9061b786ba745
Merge ... '0308024e7a88007651ed3a14db106a00b69b32a1'
     and '18c98c8c6d244da50f3f633a86903fd971aa0602'