merge of '16fca46de883fd9f3759f9964bfe144b42a54a2f'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:05:32 +0000 (10:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:05:32 +0000 (10:05 +0000)
commit0e5bbfa8c4c8f41bfcdcf675f3346a25232e95fd
tree39eaec33840e3d04756a25e470c1c08e4a05e51d
parent9b74e14dc7c4de72cdaf9d3ba7a58d1dbe888a54
parent21f170f105c74193bf1486896be04a50ae79b17c
Merge ... '16fca46de883fd9f3759f9964bfe144b42a54a2f'
     and '28930b93d59bd25dfcdb3c34e3c8d421704100f2'