merge of '1c81f55c067f96a737e8f54d256a02f24f13f8ae'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:30:22 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:30:22 +0000 (11:30 +0000)
commitcbcc5679a78ce6756051c4756b865636c3bc60b0
tree7ce63ad7cc4881d6bf74cca0fc549671dfc48777
parent9d8c87302c92bfcb71f6afff1a32449a06df7320
parentf27d939066c320621c1af8d6998f45d07857bfae
Merge ... '1c81f55c067f96a737e8f54d256a02f24f13f8ae'
     and '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'