merge of 014c14278f078f6dfed141f49e7c46dc3a059ae9
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Sep 2005 10:13:14 +0000 (10:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 10:13:14 +0000 (10:13 +0000)
commit2958e36d6fa99af4d5b70e9dac22013ca80158b0
tree55a2fdbe59ba9ade4e63751aca561f47ecea7d0a
parent9e184abb76de11a7f3441cf9e981150cf972553d
parent4d1ff99b4ce88be90171e9f62066a4d09ef7bafc
merge of 014c14278f078f6dfed141f49e7c46dc3a059ae9
     and 8decd470419c4875b29486bd2b5a7012bedb9427