merge of '6f74b1eb3fab7fe5291f29a3ca501a9512fc4ff3'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 12:37:38 +0000 (12:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 12:37:38 +0000 (12:37 +0000)
commit283c1328b3ebdd4814870f829ac3c88c13e0d06c
treee7a33f6eaf32a0968b4337f36d6bd68c0753e1ec
parentf37d1149462c5cdc1ec85c9759a8027378f72cf4
parent96422e0d8369cb88bb2f87c62806c7096f74104b
Merge ... '6f74b1eb3fab7fe5291f29a3ca501a9512fc4ff3'
     and '82fd07d559cea99227ba82e74e7ce9dc86abc33f'