merge of '2813b5b33a80acca8e53166638a06c31c96fc819'
authorKoen Kooi <koen@openembedded.org>
Sat, 12 Aug 2006 09:05:48 +0000 (09:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 12 Aug 2006 09:05:48 +0000 (09:05 +0000)
commitb48fac219880c3a0e50ea63f320a3d13c1a53645
tree4e88a837d3667d6de5ef2c16b7941854f3ba9790
parentf1dec1a4c97152e663d0ff507f2b04d94e77a3b9
parent333d469bc2eb7b14503c99082d26b6a861bc109e
Merge ... '2813b5b33a80acca8e53166638a06c31c96fc819'
     and '71d106209d375802f4d83fc7eba80d5515b6f572'