merge of '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'
authorKoen Kooi <koen@openembedded.org>
Fri, 23 Nov 2007 09:46:49 +0000 (09:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 23 Nov 2007 09:46:49 +0000 (09:46 +0000)
commita3b492daea36dcd417b30225dd9c87518d4f6d1b
tree4f02287b090ac5b091f09768f1f3cc4d977a07ca
parent555feeeeb1b1e70b4ced98ec1db6e755dd4dcebb
parentfbd7ee9a3871795cb7db38d40755d85059330bfa
Merge ... '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'
     and 'ec9b4188f1f043fd13783ea1ed8a13f349a862d8'