merge of 'b0b77e51fdd4802821fa1c92b384ac48838955b2'
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Sep 2006 21:45:31 +0000 (21:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 1 Sep 2006 21:45:31 +0000 (21:45 +0000)
commit1c704adbc5b9bf4e0d902e2910356c9f6e9287ea
tree8d0aa277006f59d673b3a0f0625d3b001367b648
parent890d766f7d6e3c35309d0155e5751e9d76376aa8
parent0fd3efb404b5e56a2fb05c25653931b5771f58b3
Merge ... 'b0b77e51fdd4802821fa1c92b384ac48838955b2'
     and 'f090702de43860d9ba4cb4911dc980b293defc81'