merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 20:34:12 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 20:34:12 +0000 (20:34 +0000)
commitaadc224474b16ce789e357665147666c3f2ca6ee
treea826749e5b9c4e7711f542d9df56e08eb894b420
parentc928c63119e7946ede587fcd633f752859d0b77e
parent349d59919077eff86e3fb48215459697d30e9731
Merge ... 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
     and 'e4016811f7d88c926c4dc798795d2b46651ddaf7'