merge of '5ccab19e0abd27e8128d91da533c52656df39aa3'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 10:11:15 +0000 (10:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Aug 2007 10:11:15 +0000 (10:11 +0000)
commit2ca14f33bc711355a68bd5b21254171571873a56
tree107ff3e70bb861a53876cd58a5a7652651855141
parent48e0d0bf8aea431dfd34bfbf03009940962f0409
parent2aa81472facb64b0fabf3d4423b24b3ef07c7b9d
Merge ... '5ccab19e0abd27e8128d91da533c52656df39aa3'
     and 'a422d794d754d9fd6d61b55a92e48c2dd601ba08'