merge of '628180938514d90c01db3867703717734d7d5d30'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 20:29:02 +0000 (20:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 20:29:02 +0000 (20:29 +0000)
commit0249d06d8d34f207012ec1b6d73c4266589b1f5e
tree993a7fffbdd41c3c66721027e72b7cfcb30a2647
parentaba1b2a5cf8f49e07d717b1e8fd8279dbc20b074
parent1977650fdda4676e78bf23e36317ad885b230bd6
Merge ... '628180938514d90c01db3867703717734d7d5d30'
     and '6392b041c5ea8ff7227964369df13245ce5d50bf'