merge of '59a04ff85afc00ee91a9cf8dd60c29dca70ba478'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:10 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:10 +0000 (16:47 +0000)
commite1feec31ce68a87f85b3d735f530f4e0cf6bf542
tree9db152e00018dcc8cd99e3fd3d233f1c1926b299
parent455dbfd2345cb072bff69b981e18a498aab54a3c
parentd891021eb7b18c90a4aa3e20899e5e5b55b0e5fb
Merge ... '59a04ff85afc00ee91a9cf8dd60c29dca70ba478'
     and '81b1167cd86ec3accb443d61ad4c7eb796461e8f'