merge of '208141d537190684b567c64480e7d161f5be0d76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jun 2007 10:45:36 +0000 (10:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jun 2007 10:45:36 +0000 (10:45 +0000)
commit5e95c99add299d451cdbfec709231c89a7e98c69
tree50e0174684e9aeb6faa3a830d8223c817b350853
parentaff97e9475c2a48122851f24b5500fd11c4600c4
parent68202566701353f27a0c266251df737464f1e4d3
Merge ... '208141d537190684b567c64480e7d161f5be0d76'
     and 'e405f1aef095e5a2011a5ac844ef2cd3598e6f76'