merge of 7e6d5167b862ccf180c98f2c1b1373bdd8fdd65f
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 23:22:16 +0000 (23:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 23:22:16 +0000 (23:22 +0000)
commit0addba49b257008c63a9c64beafd1778bd0c70f8
tree3313c81f5a209ec82c8a785c55fbf3eb23208323
parentf92a5768110135f0e65e6df83e6067b436227aac
parenta4d637cc4934e9a19b117902796ab6c728fd6cc8
merge of 7e6d5167b862ccf180c98f2c1b1373bdd8fdd65f
     and f230ea166fd00577cf73bcb2cb81ab9767e16d4c