merge of 376552a598ef9a388d419ca16b2aa113cd923ffa
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 20:46:36 +0000 (20:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 20:46:36 +0000 (20:46 +0000)
commit923e4a811754c19101be911843ede1e5e7c6a19e
tree8fca8e677080f31a277b40c77480f948e8417dd7
parent06ebfd038c02210d75dfb45bf78638771b11e49e
parentf699ef3604f2af3f321eeaa55d984d9421f83a10
merge of 376552a598ef9a388d419ca16b2aa113cd923ffa
     and 4af8f96da30c305dfbb250541de315cdfc0e5ec1