merge of '2f6a75703ff201034fac5c3a14baf261f8eb2b94'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 13:09:40 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 13:09:40 +0000 (13:09 +0000)
commitfa52b5bb47dd65353901a1218ddd9dc8a6042f3e
tree49e0d19266256eea3c63d3fcc47b72cf44ddb8fd
parent65a90ab8feb4642c518c948dc8c8be9714340f5a
parentcbdccd40595f14780870984264ac99275d699870
Merge ... '2f6a75703ff201034fac5c3a14baf261f8eb2b94'
     and '6e404b0729a59d47868eceeec95ed68998b51090'