merge of 5184d5d01f81fcaa198426dc405ef4635ac0099e
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Dec 2005 17:31:02 +0000 (17:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Dec 2005 17:31:02 +0000 (17:31 +0000)
commitab9464140b9120ec8a0cc5f8ddec50cd7f85bfb4
tree83382edf345430a256667eaf1d480686f5419f46
parentec3bff608d703cd39e2db1d6d747a063385cbe0a
parentfd131518625c38f2104cc515bd0d8879437b0bcd
merge of 5184d5d01f81fcaa198426dc405ef4635ac0099e
     and 75401918dca3876106733c357fd6be43748c9bab