merge of '8c0eb673de0b4022949225ca080e2dd264461926'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 18:04:08 +0000 (18:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 18:04:08 +0000 (18:04 +0000)
commitf704267b58de181fff67d0ab0c45ea4a40da687a
tree43419e3e2deb6915d5c02e49d4326b8011defc92
parenteb485afd8f028a7d128d500f05418d88260e9c95
parent16cb2f321befd4c69c9c938c2ec8386fcfb3336a
Merge ... '8c0eb673de0b4022949225ca080e2dd264461926'
     and 'a536e1f1c106f600dacb9b7c677edf69297378fb'