merge of '97d055550d55ba933c423fa657f7d63d18b81ed6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 12:07:30 +0000 (12:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 12:07:30 +0000 (12:07 +0000)
commit9d2b1056a5121ac78c64f51fbdc34f31ca6b092a
tree0297067debb7dc53f4afa1b6e2ac2661dead3e52
parent3012411202b9e8fea77e548b25a6e4eafece9867
parentf18c67d5ef73c90a17648feeaf14ce8ebaca1eb7
Merge ... '97d055550d55ba933c423fa657f7d63d18b81ed6'
     and '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'