merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 13:52:44 +0000 (13:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 13:52:44 +0000 (13:52 +0000)
commita547cc8f4679dd47995cdbac232ecebf3557efab
tree4d5198fff5cb9591b01511bfbb2db82b29de0faf
parent79ea420061817e7fdb1b8df966e9e71c048695c5
parent4e26080bb916add505a12ebbf67a30236b481c76
merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
     and e368307c5fec630ad2290c5e18ca93c13143d515