merge of '15e4e8f4f0911b6d7b063f78ad573c2face554e5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 18:22:36 +0000 (18:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 18:22:36 +0000 (18:22 +0000)
commit3826ce4c8b6c3ffe0308f8950a9374bcd49a4b88
treedcdeb4b765ae2f7230d19720bd54c0dc2b80aa46
parent93a2dc823489fdc119bd562fe8e32ad12808041e
parent01e1a31cd9c0c44785ab5ced216f6ffbf6a04cff
Merge ... '15e4e8f4f0911b6d7b063f78ad573c2face554e5'
     and '37205cd40f454a7b0819444bcb831e91ac8161ca'