merge of '3b34ff5513e03a2208ba8580d3e9b2b9c179f979'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 14:19:24 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 14:19:24 +0000 (14:19 +0000)
commit4b5105d846e5aa5a35c0718248ba5652e6a780fc
treee638451cff593bb579bbd0b43e8c38dd386a1799
parent8ab6d2ddbc526acc395ddc6725067b8d74af40c0
parent3088f84a899101415da38aa8744470a76d6d1d29
Merge ... '3b34ff5513e03a2208ba8580d3e9b2b9c179f979'
     and '66665e31e0da8709ccf246c100b350c79b36cea5'