merge of '5da7cf9aa3826def2c6dd499a01135180d7d6920'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 00:17:11 +0000 (00:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 00:17:11 +0000 (00:17 +0000)
commit62d5f872cfb13c9128c53107717e46151b08c2d4
tree9c57172db475183c6b1477182ecf51a61d546d5f
parent98f2476ef75f423cba5b97677506c823448473e8
parent2256b7743ce7e5767a033c0682ced0e1f70dbf00
Merge ... '5da7cf9aa3826def2c6dd499a01135180d7d6920'
     and 'c2229d2baf9f3a015f0aa6354d84590f73a5ca0a'