merge of '0693b64dbb432d884ac6897aaa6c97de6bc99af3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Feb 2008 17:28:09 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Feb 2008 17:28:09 +0000 (17:28 +0000)
commitc774a4e441deac27ee040a701926f0324cc5cd19
tree8dd7dd2ab499de64302c96767a03b65ae08d0c9a
parent5cc9834638b028694beef90531848a91c60138f5
parente8d74197f050420390f7c01bf74c0d1c72716a39
Merge ... '0693b64dbb432d884ac6897aaa6c97de6bc99af3'
     and '706ca8a56360cf090b26c74d6dc02843def49575'