merge of 23548cd42cadf3483cc0fe532a297853c7daaaa4
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 12 Aug 2005 18:37:52 +0000 (18:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Aug 2005 18:37:52 +0000 (18:37 +0000)
commit5a32047fe2abb4ecf7129e7dcc1c7f844c1f9296
tree31a501cc33e5528112fe6feac0f4ff72ef91b9a2
parenta40723453ab18ee586447ba44f43bd4299cf1555
parente5b61b233e9349fa7050ed0233f5e31c122baab9
merge of 23548cd42cadf3483cc0fe532a297853c7daaaa4
     and 96b1952909f0144eb869df86e47875a3d3e8abd2