merge of 'd03e6ea9b33f8649e0fd60a9e531f435ef2a40ca'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Mar 2007 15:08:05 +0000 (15:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Mar 2007 15:08:05 +0000 (15:08 +0000)
commit77e2700bbc7aaee3d9fb8dbccc90a2ba0048bc38
tree227bda18d9f283bc0f53dabd50bb108c3eea38fe
parent6aafdd3cdfe06a45dd4cf6725eed7b2d6f594011
parentbaa75269ade62d98a062a036f6d0533e7f617e32
Merge ... 'd03e6ea9b33f8649e0fd60a9e531f435ef2a40ca'
     and 'e2140c3f36090f469a27ce291b4786eb114eafce'