merge of '1b4c6de83b5df499179899a549a0e828450e5f48'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 16:53:57 +0000 (16:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 16:53:57 +0000 (16:53 +0000)
commit93a2dc823489fdc119bd562fe8e32ad12808041e
tree583f6c963bb2c295a5eb23a149e344eb246f8e70
parente99bc01925dde267dadec16171e6e9e2bb2662a5
parentb4a500dc735af49ec5e2fd45eb87f5be7cb2fe26
Merge ... '1b4c6de83b5df499179899a549a0e828450e5f48'
     and 'a35e2ad2f017a5ac5548780f30e3365bbe93d48a'