merge of '3b51ced2ab6352c3aa1358c560ebf030e37a0f3b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jun 2007 18:07:37 +0000 (18:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jun 2007 18:07:37 +0000 (18:07 +0000)
commit595bfc663fd746353f9214b16a041a5bc75a7ff2
tree6b30c7cfea84e7433020f43eed2be9c32eec4e5a
parent6bf558d5065297cb8e4c0b11b7aa39779e89253b
parentffbe139cc96fd1f387d259ee825bf48d7be8b137
Merge ... '3b51ced2ab6352c3aa1358c560ebf030e37a0f3b'
     and 'b9511657e9fa0254ec10af333b56841e7c0f6cc0'