merge of '2fce1b18b908ec5929c213cc29050175502a72a6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jun 2008 22:48:49 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jun 2008 22:48:49 +0000 (22:48 +0000)
commitda8b925e65f4fd85dea06aa0355e7a443671e682
treecb9429b740244099f3de47d85c1bbff1217512c6
parent48941e3a7b5c95e06e6f7504660893e3f1f5c445
parent37bc40217934d8490498f85a93594925ad608c37
Merge ... '2fce1b18b908ec5929c213cc29050175502a72a6'
     and 'a42c91c4ca9edb328881ae31da2dbdb01a976e1e'