merge of 37a520a39f5f3affca5295dece5c847608f29174
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Feb 2006 16:51:21 +0000 (16:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 16:51:21 +0000 (16:51 +0000)
commitb384d1778ec171faeeec537020c8f8a30107ea95
tree38ed1ebf038e9c6ef183cdf36edd76762559a7b7
parent599e57053177577ed76ae83f6060b6e4051a56f7
parent7069065ff05ea9e7c9714d521a7d2f9818fe23b6
merge of 37a520a39f5f3affca5295dece5c847608f29174
     and ec9469056d43dac6d0e66ed19704b0fe7fb37cee