merge of '1d173acb1b7f8a2e7127fddb4716194d677d3440'
authorKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 19:39:11 +0000 (19:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 19:39:11 +0000 (19:39 +0000)
commite8520e968d6cdb70f8976784bc3332e6d0804e5e
tree84abbb324397830bb2a0e3a7e386f488eb9b4f18
parent2178a8e0ad060381cf29f5a20e1ac1fbf5ed83c4
parente8bf8be4390a15c6bc5d345b1ca767c25c061ef3
Merge ... '1d173acb1b7f8a2e7127fddb4716194d677d3440'
     and 'bd7627fcd5e0f5566f8fa82c30d1cd95e9900926'