merge of '32e3cb7e99864d52a06bdc489a128fc6d02960c2'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 13:10:24 +0000 (13:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 13:10:24 +0000 (13:10 +0000)
commiteba76d729e4ac75360145f229c4cf8785e857278
tree8d6dfe8f5b825fcb5ee7b589b222abab1d635ae1
parenta14bd3ec238aa182ade29a1a20aabe0dca2a22a3
parent035d5b2e4e0a3543d3564e55d99cf888d262028b
Merge ... '32e3cb7e99864d52a06bdc489a128fc6d02960c2'
     and '9f20eba616b60c443a76d8de23b3759590c868c8'