merge of 858e64537efe69df63da6cafca905f211aa07966
authorRod Whitby <rod@whitby.id.au>
Tue, 8 Nov 2005 16:39:39 +0000 (16:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 16:39:39 +0000 (16:39 +0000)
commitda805c92d09b4bf82a6945d603f194a314b7337d
tree6ca99f88fe239dde68f75eb6bd612982f3cb7647
parentb3a31833e37a8134294fb0c9a2f66aab74859813
parent57f454f55e18298ae1b32afb6f9ae74eea1c648c
merge of 858e64537efe69df63da6cafca905f211aa07966
     and c1a4fbc4fa6781b2aaf2fb4c8c767604861616e7