merge of 38a44153ccd68cbefcfc7eb3e945b52f959edfe6
authorRod Whitby <rod@whitby.id.au>
Sat, 13 Aug 2005 17:18:01 +0000 (17:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 17:18:01 +0000 (17:18 +0000)
commit59e4f52ef55151691f55b31bbb581bf031d674fd
tree12fd5373a36bbbc810327d59afaeb8644e8713ad
parent9dc45ad0f61abfd589855757860a815deccaaeed
parent4eddaed4476f9768827c89933ca3581612bbc1a9
merge of 38a44153ccd68cbefcfc7eb3e945b52f959edfe6
     and a64c34c36a6a5002d454fa4f8693cedf5fce8d73