merge of '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
authorKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:41:40 +0000 (09:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 10 Oct 2007 09:41:40 +0000 (09:41 +0000)
commitc7b4ec5d9d0f4ea27981de069b60a4c5b2152195
tree88bdba25695382e956aa4e834d28d086c7e73428
parented583c47b20806156a4bb0b2b48925dff5fe79b8
parent500cdc9f7814236f150767c09eb10f33e0c030d0
Merge ... '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
     and 'dbb53fe45696a4f12d4e96c449c65f691e0e8346'