merge of 'acd8498e4573491722380c035bd7b58de78410ee'
authorKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 11:46:42 +0000 (11:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 11:46:42 +0000 (11:46 +0000)
commit09436056f94e7103d436177bdaea7c3bd9493913
treeda9cb1ef73327d2c7fd2b53bcdb48cc11d177349
parent60a95145ce57c6116be31bd197a406e368102fc4
parentab200f3815379c7d4f7e790e5b60c02d6fdf866f
Merge ... 'acd8498e4573491722380c035bd7b58de78410ee'
     and 'd7cc6ec7ff432b7592af0d14fbe1777a3bebd543'