merge of 'b873786ee35b1f62b5c333fe362ee5964ac4b2db'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 15:53:17 +0000 (15:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 15:53:17 +0000 (15:53 +0000)
commit16aa0511beed363b7ecf24f207fd2dcba92c2108
tree423395afdd98166a093410a49e868be824262784
parent096785ec3979ed50aace999d853bfa089731fc95
parent4bec22c33a67f6bc7cc0270c13bda563f35b1755
Merge ... 'b873786ee35b1f62b5c333fe362ee5964ac4b2db'
     and 'd21d59c6a78079e1c4a6449b93e9afdf358e7a6c'