merge of e74c73570c2c682aebf3f9050ed959e4f615d79e
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Jul 2005 13:15:49 +0000 (13:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 13:15:49 +0000 (13:15 +0000)
commit04a269c583bc9586020846c8668d847b5de6095f
treecaa1b30aa5548b9f44e99043787c0b30b26ae105
parentdb5f69fd2cc3ca3053b899237dfde27ed9134950
parent3143c04f905275f5f07c4147c914e7f859b5fd7d
merge of e74c73570c2c682aebf3f9050ed959e4f615d79e
     and efd8c005871477b3c2788c1257799459527dd028