merge of '5245fa92de31b9af071626ab0aa8ee1699126429'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 15:47:36 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 15:47:36 +0000 (15:47 +0000)
commiteb970796247f0ae41e7229d981bce329b778660e
treef9f7c68831fe938c04cc026b97a4c82f907a4de9
parentdf954d1fc8ff59121eeaaf4c83b2090c92d5ece3
parent3dd0115a4ddc267c7018298c659947100d278012
Merge ... '5245fa92de31b9af071626ab0aa8ee1699126429'
     and 'd589ae71d47d05c2754a75c5d7d6af2d12e8c58f'