merge of '421f0e4f9d6c592d160a826be5537441f095bec7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 20:35:47 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 20:35:47 +0000 (20:35 +0000)
commite19580a1345c0b87026613f9c75510b8a9f2a3ee
tree8687a242910cf9723bb5e16e0e84e12b1d692753
parent8794aab16b8db895c656e4021f755f6a585a676b
parentc0149ee4a8478d3b771847b9bfc7b5e0cdc370e5
Merge ... '421f0e4f9d6c592d160a826be5537441f095bec7'
     and '8c8d9512a1c377169fe0bc4cfe411d74aa9e22a1'