merge of '089195e6226693953dd9be785e533fa29173045a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 19:07:39 +0000 (19:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 19:07:39 +0000 (19:07 +0000)
commit7c9ac6ee380c57c5cf6e6b16901e1fd80d6586f6
tree610eef79dce5a79b1d0d8980b4c049512fd34fef
parent5e1ac86721a4a174e1f6aba574e8a48c38688daa
parent5337400a8b633f87ca6ffbbe1f39166df907c96a
Merge ... '089195e6226693953dd9be785e533fa29173045a'
     and '764a3b1e5fd150d455e950bb13047d41a6173353'