merge of '6114e88c0acc202895c41c560c0546244d2c5227'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Nov 2007 19:41:52 +0000 (19:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Nov 2007 19:41:52 +0000 (19:41 +0000)
commit4a281508a90b1bb52265aa9415c72de78c4ad964
tree97efae12de0966da1f87248fb8c750dfc270050a
parent878f6a08325a4344f95198f157a021c2a0b7516b
parent7e7492b6e5eb11c460a21308806243946c719169
Merge ... '6114e88c0acc202895c41c560c0546244d2c5227'
     and 'c971ec89c74107b683a418e2b491026999418bc4'