merge of 'b3a0ae7ae12db4c4db9d0e3b6c0b7dc12d016de8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jun 2007 19:23:21 +0000 (19:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jun 2007 19:23:21 +0000 (19:23 +0000)
commite2596dfae87b4c40af85a92da737e7cc1d464b42
tree7ff8e74d028d80ab2fb84cc4e90bd497aa44c16f
parent2bc6f0422872756aab91ead2b1d945b67718a27f
parentad3b62aa520cfd714e323317251e4dc48fa8785e
Merge ... 'b3a0ae7ae12db4c4db9d0e3b6c0b7dc12d016de8'
     and 'f1f6c3162864d453a8850ecb87b1994f9b160b9d'