merge of '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
authorKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 11:08:53 +0000 (11:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 11:08:53 +0000 (11:08 +0000)
commit117b467cb9535d0276ba74a36b3fbd71207a666b
treeb74c3df17ebbe262fd476ab0b17c2c2d0b93c5ba
parentac916651b26667327d7f78e33801cbd4e6bff8ed
parent6f873a200f5003c2c8ff072b0bc6eddca74ce7a3
Merge ... '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
     and 'ca20876bde8f155d49159fb19e6254cf4eaf0b43'