merge of '1204e87a453bbdf170c23aa9d255e81dff83b89c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 17:32:10 +0000 (17:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 17:32:10 +0000 (17:32 +0000)
commitb066c11ddae11bb0fc61eae81d595f6318855500
tree3927771559a1a7bd45aa241cabe898c42235dd76
parent00d65ea816431998476de087ca827f96efe3a84c
parentf1b098d1a9bf05fbe9d6aa6e51c739f43eca3a12
Merge ... '1204e87a453bbdf170c23aa9d255e81dff83b89c'
     and '65003f86cc1c1103afc51869cf2d4a63f8d88613'