merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
authorGraeme Gregory <dp@xora.org.uk>
Mon, 10 Jul 2006 12:29:44 +0000 (12:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Jul 2006 12:29:44 +0000 (12:29 +0000)
commit85c7ce92f6dfecfcd5c858838c296f86a93bd872
tree20fef722b7d5a0d158250770cbc05a0c3d69dbf1
parent92b85e13e4cdd03bba753ce5273323cb651e5e38
parent9b4705fcbfe65883d928610f26ca34dcbbec77e5
merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
     and f3515be6618dd23c0a5917c27c9607c052d6df83