merge of '3eca6e20852dc85705fb05ad1be96527ff27ec27'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 09:42:30 +0000 (09:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 09:42:30 +0000 (09:42 +0000)
commitddda7becd6df3c8abbae2f9b7180321a308c2991
tree4c03fddae4828fb030c825d81e20c4f3f8191d7d
parent6adb3fcb48f4efcdcc06165419f3c8dd4d34cf05
parente25cfc625748c1c714533623c01cebed7a78c880
Merge ... '3eca6e20852dc85705fb05ad1be96527ff27ec27'
     and '442f3e4d64766f0dd94a0834278fbfb328811ecc'