merge of '2de318fc2a95854259cdc31038f89dae83fb0121'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 19:11:03 +0000 (19:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 19:11:03 +0000 (19:11 +0000)
commit66af3461a3fdf3eb7ceb76bb2a04e66be8283b8c
tree78f52aa29ac0f42c4aea59a4da6e8dab0c701ca4
parent9a1d156623f21d1f66c4314230056c8499d556f5
parent50468ef124004fb33fa463842b2042de16082159
Merge ... '2de318fc2a95854259cdc31038f89dae83fb0121'
     and 'f94c84daf04e33f569fffdd3b60be112b594c750'