merge of 'cc5e07dd7b07fafb652332925795d57a51e7d58c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:02:47 +0000 (16:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:02:47 +0000 (16:02 +0000)
commit77d32fcd1d45b9fd073964382fd2f6753d272ccc
treeec28fdf93b15d6d6db4ac10b5641c059e526fa78
parent64c2f3ecd35d4eb2aacde6705cdbb4fffb2fc5aa
parent5a2b19f3c9fbb5621696b4f20a04e39f251e7df9
Merge ... 'cc5e07dd7b07fafb652332925795d57a51e7d58c'
     and 'f90c9d0f1288b060a8c57b9eb3c70e06353fe93a'