merge of 65b0cd64eeef02b789460148d6bb958749417f11
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 00:16:26 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:16:26 +0000 (00:16 +0000)
commit1be31761f3449cd4f92508fd2c2c41968039c918
tree31ff111bee29e508ecfe887797443b67df9b8a9e
parent062e000a4691d4884a3ae0233246fb259a335969
parent150f11c549250392406f3f2d3971862402deec29
merge of 65b0cd64eeef02b789460148d6bb958749417f11
     and fe9207286fe795f141cfced1550795b360e1e971