merge of '714f8404b02451929d6ca37a4f8a38beffae0322'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jun 2007 17:49:03 +0000 (17:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jun 2007 17:49:03 +0000 (17:49 +0000)
commit18be98df39fd1d49c716a27ed99ffbbdd78119d0
treef80a8c58a5d637b11f7dd607453ecbd97d09bb78
parentbf2264e44a59b99bfbefe831e55f799e868bb919
parent1e25d5cdbe470c59c67fdfd34d325c3d9fc52879
Merge ... '714f8404b02451929d6ca37a4f8a38beffae0322'
     and 'c3bf7d428ff163b2d84f615a9787148c42aefa89'