merge of '34f1a5cd503f1c1aef18d4468fb112306166c499'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 12:34:41 +0000 (12:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 12:34:41 +0000 (12:34 +0000)
commit2cb647d149cac7d65031fd4d95d19aa88d445045
treeb0a85f7fdb08409b4b6b195052f05e5a7bfdc36c
parentf4b18fced24ea7704b429db86f7638a779079407
parent36eac0c5866ae3632436d51f5d2b9fae884a1238
Merge ... '34f1a5cd503f1c1aef18d4468fb112306166c499'
     and 'd3b7dd0f986647b0949b0f10ae6b633653a05bde'