merge of '6a082250c6cd3fb922881d5729805a86eb61e646'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 07:24:34 +0000 (07:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Feb 2007 07:24:34 +0000 (07:24 +0000)
commitaf611983e0f4a013e1fb5a19715c6e803dbb68d7
tree123067a75e489e9dc1fed28bda78641136ee829e
parent464d501ed34c9b151ff535d95efc4f4b29d4b761
parent7eb910e2177cfb1e185df53c68eb41f439cf9bc2
Merge ... '6a082250c6cd3fb922881d5729805a86eb61e646'
     and 'e28e771e310bd57f5612859b2188e316aec06191'