merge of '1071338fe9143d91f11215f627150ab1adc3a923'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Oct 2007 19:18:28 +0000 (19:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Oct 2007 19:18:28 +0000 (19:18 +0000)
commit8acf0bf20e7d1f4fb89de4df260fb7b4c83cb9d5
treef2bc4a8507c48293262dc28a18cb1b0a7ccee990
parentfe3f6d35780691438cdd9b9d9c2ed57f6be91b15
parentadecb539d2fdcca398f31e7220dc15d13633994d
Merge ... '1071338fe9143d91f11215f627150ab1adc3a923'
     and '2cffc57d52392fbeabd7156350a781b1a803493e'