merge of '118a617db4118b3a38a8228d498c7dc59d711702'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:21:03 +0000 (00:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:21:03 +0000 (00:21 +0000)
commit8236f3ddafc939b3e2295879b4289fd954258eef
treed8e2689de2568b39bc4088fb7be9da03f21a69d7
parent9a5744657866150cbaf433bd3b32253fe26421ea
parent2fe10c088ac5f959fcce4aac04d596f88f598fdd
Merge ... '118a617db4118b3a38a8228d498c7dc59d711702'
     and '2bf1435f45f314c6cf35f23ccdd55ab9ed8a1032'