merge of 0b5d6ed48b6bbd6c6c562be67f6b8f51f55433c0
authorRod Whitby <rod@whitby.id.au>
Thu, 13 Apr 2006 19:36:24 +0000 (19:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Apr 2006 19:36:24 +0000 (19:36 +0000)
commitc69c2e03ced0bf4fcbfcf388c6e3538eb75df92f
tree9bd31c3ac40952544076b0f181afe2dd203fdec9
parent4b0f93193e9db4cbf17beaeb2030c03ab4928180
parent7edbb7fa35ad10ba3a3501d0e09de3672d76b4e1
merge of 0b5d6ed48b6bbd6c6c562be67f6b8f51f55433c0
     and cf432acec69f2b77b5f85cd8f610464a164f2251