merge of c5acd74e482d1e7de50bea58a79d8784225f2e5e
authorGraeme Gregory <dp@xora.org.uk>
Wed, 21 Jun 2006 10:16:24 +0000 (10:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 10:16:24 +0000 (10:16 +0000)
commitc42d24b5fa03ee99ee73030dd09e93d6dd1eb14a
tree6ba74b496993ce3d65e2c41e0114810ad8d06573
parent74703c393c14c2e7d357942fa2739fb703a91465
parentdf74e8c851289bb212fd2d7ca4a16ee1c143a81b
merge of c5acd74e482d1e7de50bea58a79d8784225f2e5e
     and f44ffed4d1c961106d82ea95f9bb41d70cd60e66