merge of '11dbe81fa9fbb8336ab11a65894765c226768d3f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Sep 2007 13:53:21 +0000 (13:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Sep 2007 13:53:21 +0000 (13:53 +0000)
commit42f75b6ec3c0c9367e39fe927cbbdfa256cc28af
tree2fd36c61deb9d34a495cee6c18ad0e7f6cb3823c
parentab6283d50c13636b39fefa0b621072e8c87dd6a0
parent76b30e1ea976c20e7c73916a3eb4ca7566436d32
Merge ... '11dbe81fa9fbb8336ab11a65894765c226768d3f'
     and '76a8d4eeb5f5753a51ba8c050c4097569a70d5d7'