merge of '0e517dabcd24598274e65b9a372217fa56ffe66a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 19:56:51 +0000 (19:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 19:56:51 +0000 (19:56 +0000)
commit1bfb615d5157cf619a9d40189ed992f8958ce4c6
tree819bdf74903556977911157a4faf3c608f072035
parent0a2cef9977b324247353cede5568b50a8d8e34c5
parent19977af39fa0f87b7411838b87083fcb3f4aaf2a
Merge ... '0e517dabcd24598274e65b9a372217fa56ffe66a'
     and '560eb1fe854306a1781ae17f1c30c0271e110cfd'