merge of 94d7300df891d316206c5d2638f48b33f130cdf6
authorRod Whitby <rod@whitby.id.au>
Thu, 8 Dec 2005 07:38:29 +0000 (07:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Dec 2005 07:38:29 +0000 (07:38 +0000)
commit17674905105bf2bced88e9ce641a09dd199109b3
tree42d47cea1f15d3b6922fe2bd5e681e0884bcf6f1
parentb3d83dff4831a0b515357d6c91cd3246f66845bd
parent176a192069a78a7b860c0e6276bb3e4f9aa1a195
merge of 94d7300df891d316206c5d2638f48b33f130cdf6
     and b12a6f317d2686fea2fdf958f105aefd8de77146