merge of '1d5e5e75e72979319be31deaac4917c4f7140feb'
authorKoen Kooi <koen@openembedded.org>
Sun, 6 May 2007 07:31:07 +0000 (07:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 6 May 2007 07:31:07 +0000 (07:31 +0000)
commit8ecd0965364d9269bde7e613119181bf9f1d86e9
tree9d280182011004eb4d285c56a7de91d692399637
parentc6efd9721b8ad4e46b8e3c4977825d3fefb56dd4
parent355557d69033685a666dda3ae874d4d79ea0f2e8
Merge ... '1d5e5e75e72979319be31deaac4917c4f7140feb'
     and 'f4c9a51fe022025ad399daed859ad871af6b77a1'