merge of '72cc9aa13fd4a4fd274deff49056beb2f6eb0784'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 09:53:32 +0000 (09:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 09:53:32 +0000 (09:53 +0000)
commit8e99005931c1a13abb7408a640452a1b65d8be28
treec4a7ccf2e490eb4f119fc15a23c53072ea693336
parentc93cbdfab6547c4aba3f4e018c90476ba54d0cdd
parent4a56525e0c36b2f09f8659d6b7839ad13ccfc61b
Merge ... '72cc9aa13fd4a4fd274deff49056beb2f6eb0784'
     and '8b7536d16e1b51ee2b13d1603f919531a1c9d949'