merge of '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 08:47:59 +0000 (08:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 08:47:59 +0000 (08:47 +0000)
commit05314ecd8854d512bb52e861bbfa1153844c3255
treee8a9fbc4c97a0a62920cf403e7f0f9ecade16a09
parente56210e856c7dc4030e685f7346e78604691e3d0
parent733d1379bea5062c7dfd096776d547ee5fa6c798
Merge ... '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
     and 'f0acec47ef997751817df5f6b967a73fec86904a'