merge of 608d58e1665f9ad5851aebd539e2ab73ff70fa54
authorRod Whitby <rod@whitby.id.au>
Fri, 28 Apr 2006 21:40:11 +0000 (21:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 21:40:11 +0000 (21:40 +0000)
commit160b95085028e602a8469d02d71140c798e773a3
treedcc1a8b6b930d657495342d9f9d4c4ec51f70cf4
parenta592efe2ce990e05d11991b0c578f7f1d28b0574
parent4fad54cc09629b3c5f2964fc5ed32bec3c3e224f
merge of 608d58e1665f9ad5851aebd539e2ab73ff70fa54
     and 60ed4023d76ee23e593805e751d227e788d38682