merge of '62059cae4cb0ae75e3be74df3c9f3a84152b2c00'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Aug 2007 19:27:17 +0000 (19:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Aug 2007 19:27:17 +0000 (19:27 +0000)
commit7f5a5b5b677552eb0f158355d10915654bb80f3c
treead5e856a40300a997ca1fdab19be7cba0cd46d3c
parent8aa7544271bce94e04749398a04a3fe3a2399036
parent09744802bdb81c4c9ed914f6704040cd79dc9d3e
Merge ... '62059cae4cb0ae75e3be74df3c9f3a84152b2c00'
     and 'd6a10d625959447cfd5ddb1d23ccd908be4f2ca7'