merge of '5a26245df5a73c8d0bf8f987e469566f6955e6cf'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Oct 2006 19:44:38 +0000 (19:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Oct 2006 19:44:38 +0000 (19:44 +0000)
commit0da570019e7b647998eef24506a6868169f4b242
tree16c0bebac1d530d1b3118731786ada215ae78ef6
parent4374bb4c6f490718d8e69220dc6640b2a60bc95e
parent1268ed3f3ae0a76383e03b5c373b82c551c213a6
Merge ... '5a26245df5a73c8d0bf8f987e469566f6955e6cf'
     and 'a6b55df21b68c18274ec3a7e51a4a8fb1f75ea3f'