merge of '1e0c7e9af08cc3d33b61608f1780d80214f1c51a'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:21:40 +0000 (14:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:21:40 +0000 (14:21 +0000)
commitbb857117246bcabd2a849d95c8bf84c01c6635ef
tree3f552273f1b68214bd681940cf5771a8cf086037
parent291ac197985b8fe9d87b4c07c8072b33dbc6a495
parentd3c22d9541b36a0853eb4c3013b1c9a59ded0585
Merge ... '1e0c7e9af08cc3d33b61608f1780d80214f1c51a'
     and 'f236af3007cc25b83011ee388e69831ee54c7be7'