merge of 'a2aae4f80718c14e9f674b807392f44f885c5b12'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 21:47:46 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 21:47:46 +0000 (21:47 +0000)
commitf56d77657f2b1433f569d2d3ccad97906c144815
tree980aa3bcdc5b3669b7c9c6d329db2adbd103c267
parent4cb3eea839ce10c654652c45a9fd93efe9b4d9c4
parent0cffbf6556537b82c02f36dca18ca1ed7cd038ea
Merge ... 'a2aae4f80718c14e9f674b807392f44f885c5b12'
     and 'db14262a47dcb743532984359aa1cc6972d10007'