updates license information and indentation fixes

1 files changed, 246 insertions, 247 deletions

diff --git a/LICENSE b/LICENSE
index acfc9202c7..4dead698a1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -35,242 +35,242 @@ Except when otherwise stated (look for LICENSE files or information at
 the beginning of each file) the files in the 'pypy' directory are each
 copyrighted by one or more of the following people and organizations:    
 
-  Armin Rigo
-  Maciej Fijalkowski
-  Carl Friedrich Bolz
-  Antonio Cuni
-  Amaury Forgeot d'Arc
-  Samuele Pedroni
-  Alex Gaynor
-  Michael Hudson
-  David Schneider
-  Holger Krekel
-  Christian Tismer
-  Hakan Ardo
-  Benjamin Peterson
-  Matti Picus
-  Philip Jenvey
-  Anders Chrigstrom
-  Brian Kearns
-  Eric van Riet Paap
-  Richard Emslie
-  Alexander Schremmer
-  Wim Lavrijsen
-  Dan Villiom Podlaski Christiansen
-  Manuel Jacob
-  Lukas Diekmann
-  Sven Hager
-  Anders Lehmann
-  Aurelien Campeas
-  Niklaus Haldimann
-  Ronan Lamy
-  Camillo Bruni
-  Laura Creighton
-  Toon Verwaest
-  Leonardo Santagada
-  Seo Sanghyeon
-  Justin Peel
-  Ronny Pfannschmidt
-  David Edelsohn
-  Anders Hammarquist
-  Jakub Gustak
-  Guido Wesdorp
-  Lawrence Oluyede
-  Bartosz Skowron
-  Daniel Roberts
-  Niko Matsakis
-  Adrien Di Mascio
-  Ludovic Aubry
-  Alexander Hesse
-  Jacob Hallen
-  Romain Guillebert
-  Jason Creighton
-  Alex Martelli
-  Michal Bendowski
-  Jan de Mooij
-  Michael Foord
-  Stephan Diehl
-  Stefan Schwarzer
-  Valentino Volonghi
-  Tomek Meka
-  Patrick Maupin
-  stian
-  Bob Ippolito
-  Bruno Gola
-  Jean-Paul Calderone
-  Timo Paulssen
-  Alexandre Fayolle
-  Simon Burton
-  Marius Gedminas
-  John Witulski
-  Greg Price
-  Dario Bertini
-  Mark Pearse
-  Simon Cross
-  Konstantin Lopuhin
-  Andreas Stührk
-  Jean-Philippe St. Pierre
-  Guido van Rossum
-  Pavel Vinogradov
-  Paul deGrandis
-  Ilya Osadchiy
-  Adrian Kuhn
-  Boris Feigin
-  tav
-  Georg Brandl
-  Bert Freudenberg
-  Stian Andreassen
-  Stefano Rivera
-  Wanja Saatkamp
-  Gerald Klix
-  Mike Blume
-  Taavi Burns
-  Oscar Nierstrasz
-  David Malcolm
-  Eugene Oden
-  Henry Mason
-  Preston Timmons
-  Jeff Terrace
-  David Ripton
-  Dusty Phillips
-  Lukas Renggli
-  Guenter Jantzen
-  Tobias Oberstein
-  Remi Meier
-  Ned Batchelder
-  Amit Regmi
-  Ben Young
-  Nicolas Chauvat
-  Andrew Durdin
-  Michael Schneider
-  Nicholas Riley
-  Jason Chu
-  Igor Trindade Oliveira
-  Jeremy Thurgood
-  Rocco Moretti
-  Gintautas Miliauskas
-  Michael Twomey
-  Lucian Branescu Mihaila
-  Tim Felgentreff
-  Tyler Wade
-  Gabriel Lavoie
-  Olivier Dormond
-  Jared Grubb
-  Karl Bartel
-  Brian Dorsey
-  Victor Stinner
-  Stuart Williams
-  Jasper Schulz
-  Toby Watson
-  Antoine Pitrou
-  Aaron Iles
-  Michael Cheng
-  Justas Sadzevicius
-  Gasper Zejn
-  Neil Shepperd
-  Mikael Schönenberg
-  Elmo Mäntynen
-  Tobias Pape
-  Jonathan David Riehl
-  Stanislaw Halik
-  Anders Qvist
-  Chirag Jadwani
-  Beatrice During
-  Alex Perry
-  Vincent Legoll
-  Alan McIntyre
-  Alexander Sedov
-  Corbin Simpson
-  Christopher Pope
-  Laurence Tratt
-  Guillebert Romain
-  Christian Tismer 
-  Dan Stromberg
-  Stefano Parmesan
-  Christian Hudon
-  Alexis Daboville
-  Jens-Uwe Mager
-  Carl Meyer
-  Karl Ramm
-  Pieter Zieschang
-  Gabriel
-  Paweł Piotr Przeradowski
-  Andrew Dalke
-  Sylvain Thenault
-  Nathan Taylor
-  Vladimir Kryachko
-  Jacek Generowicz
-  Alejandro J. Cura
-  Jacob Oscarson
-  Travis Francis Athougies
-  Kristjan Valur Jonsson
-  Neil Blakey-Milner
-  Lutz Paelike
-  Lucio Torre
-  Lars Wassermann
-  Henrik Vendelbo
-  Dan Buch
-  Miguel de Val Borro
-  Artur Lisiecki
-  Sergey Kishchenko
-  Ignas Mikalajunas
-  Christoph Gerum
-  Martin Blais
-  Lene Wagner
-  Tomo Cocoa
-  Andrews Medina
-  roberto@goyle
-  William Leslie
-  Bobby Impollonia
-  timo@eistee.fritz.box
-  Andrew Thompson
-  Yusei Tahara
-  Roberto De Ioris
-  Juan Francisco Cantero Hurtado
-  Godefroid Chappelle
-  Joshua Gilbert
-  Dan Colish
-  Christopher Armstrong
-  Michael Hudson-Doyle
-  Anders Sigfridsson
-  Yasir Suhail
-  Floris Bruynooghe
-  Akira Li
-  Gustavo Niemeyer
-  Stephan Busemann
-  Anna Katrina Dominguez
-  Christian Muirhead
-  James Lan
-  shoma hosaka
-  Daniel Neuhäuser
-  Buck Golemon
-  Konrad Delong
-  Dinu Gherman
-  Chris Lambacher
-  coolbutuseless@gmail.com
-  Jim Baker
-  Rodrigo Araújo
-  Armin Ronacher
-  Brett Cannon
-  yrttyr
-  Zooko Wilcox-O Hearn
-  Tomer Chachamu
-  Christopher Groskopf
-  opassembler.py
-  Antony Lee
-  Jim Hunziker
-  Markus Unterwaditzer
-  Even Wiik Thomassen
-  jbs
-  soareschen
-  Flavio Percoco
-  Kristoffer Kleine
-  yasirs
-  Michael Chermside
-  Anna Ravencroft
-  Andrew Chambers
-  Julien Phalip
-  Dan Loewenherz
+    Armin Rigo
+    Maciej Fijalkowski
+    Carl Friedrich Bolz
+    Antonio Cuni
+    Amaury Forgeot d'Arc
+    Samuele Pedroni
+    Alex Gaynor
+    Michael Hudson
+    David Schneider
+    Holger Krekel
+    Christian Tismer
+    Hakan Ardo
+    Benjamin Peterson
+    Matti Picus
+    Philip Jenvey
+    Anders Chrigstrom
+    Brian Kearns
+    Eric van Riet Paap
+    Richard Emslie
+    Alexander Schremmer
+    Wim Lavrijsen
+    Dan Villiom Podlaski Christiansen
+    Manuel Jacob
+    Lukas Diekmann
+    Sven Hager
+    Anders Lehmann
+    Aurelien Campeas
+    Niklaus Haldimann
+    Ronan Lamy
+    Camillo Bruni
+    Laura Creighton
+    Toon Verwaest
+    Leonardo Santagada
+    Seo Sanghyeon
+    Justin Peel
+    Ronny Pfannschmidt
+    David Edelsohn
+    Anders Hammarquist
+    Jakub Gustak
+    Guido Wesdorp
+    Lawrence Oluyede
+    Bartosz Skowron
+    Daniel Roberts
+    Niko Matsakis
+    Adrien Di Mascio
+    Ludovic Aubry
+    Alexander Hesse
+    Jacob Hallen
+    Romain Guillebert
+    Jason Creighton
+    Alex Martelli
+    Michal Bendowski
+    Jan de Mooij
+    Michael Foord
+    Stephan Diehl
+    Stefan Schwarzer
+    Valentino Volonghi
+    Tomek Meka
+    Patrick Maupin
+    stian
+    Bob Ippolito
+    Bruno Gola
+    Jean-Paul Calderone
+    Timo Paulssen
+    Alexandre Fayolle
+    Simon Burton
+    Marius Gedminas
+    John Witulski
+    Greg Price
+    Dario Bertini
+    Mark Pearse
+    Simon Cross
+    Konstantin Lopuhin
+    Andreas Stührk
+    Jean-Philippe St. Pierre
+    Guido van Rossum
+    Pavel Vinogradov
+    Paul deGrandis
+    Ilya Osadchiy
+    Adrian Kuhn
+    Boris Feigin
+    tav
+    Georg Brandl
+    Bert Freudenberg
+    Stian Andreassen
+    Stefano Rivera
+    Wanja Saatkamp
+    Gerald Klix
+    Mike Blume
+    Taavi Burns
+    Oscar Nierstrasz
+    David Malcolm
+    Eugene Oden
+    Henry Mason
+    Preston Timmons
+    Jeff Terrace
+    David Ripton
+    Dusty Phillips
+    Lukas Renggli
+    Guenter Jantzen
+    Tobias Oberstein
+    Remi Meier
+    Ned Batchelder
+    Amit Regmi
+    Ben Young
+    Nicolas Chauvat
+    Andrew Durdin
+    Michael Schneider
+    Nicholas Riley
+    Jason Chu
+    Igor Trindade Oliveira
+    Jeremy Thurgood
+    Rocco Moretti
+    Gintautas Miliauskas
+    Michael Twomey
+    Lucian Branescu Mihaila
+    Tim Felgentreff
+    Tyler Wade
+    Gabriel Lavoie
+    Olivier Dormond
+    Jared Grubb
+    Karl Bartel
+    Brian Dorsey
+    Victor Stinner
+    Stuart Williams
+    Jasper Schulz
+    Toby Watson
+    Antoine Pitrou
+    Aaron Iles
+    Michael Cheng
+    Justas Sadzevicius
+    Gasper Zejn
+    Neil Shepperd
+    Mikael Schönenberg
+    Elmo Mäntynen
+    Tobias Pape
+    Jonathan David Riehl
+    Stanislaw Halik
+    Anders Qvist
+    Chirag Jadwani
+    Beatrice During
+    Alex Perry
+    Vincent Legoll
+    Alan McIntyre
+    Alexander Sedov
+    Corbin Simpson
+    Christopher Pope
+    Laurence Tratt
+    Guillebert Romain
+    Christian Tismer 
+    Dan Stromberg
+    Stefano Parmesan
+    Christian Hudon
+    Alexis Daboville
+    Jens-Uwe Mager
+    Carl Meyer
+    Karl Ramm
+    Pieter Zieschang
+    Gabriel
+    Paweł Piotr Przeradowski
+    Andrew Dalke
+    Sylvain Thenault
+    Nathan Taylor
+    Vladimir Kryachko
+    Jacek Generowicz
+    Alejandro J. Cura
+    Jacob Oscarson
+    Travis Francis Athougies
+    Kristjan Valur Jonsson
+    Neil Blakey-Milner
+    Lutz Paelike
+    Lucio Torre
+    Lars Wassermann
+    Henrik Vendelbo
+    Dan Buch
+    Miguel de Val Borro
+    Artur Lisiecki
+    Sergey Kishchenko
+    Ignas Mikalajunas
+    Christoph Gerum
+    Martin Blais
+    Lene Wagner
+    Tomo Cocoa
+    Andrews Medina
+    roberto@goyle
+    William Leslie
+    Bobby Impollonia
+    timo@eistee.fritz.box
+    Andrew Thompson
+    Yusei Tahara
+    Roberto De Ioris
+    Juan Francisco Cantero Hurtado
+    Godefroid Chappelle
+    Joshua Gilbert
+    Dan Colish
+    Christopher Armstrong
+    Michael Hudson-Doyle
+    Anders Sigfridsson
+    Yasir Suhail
+    Floris Bruynooghe
+    Akira Li
+    Gustavo Niemeyer
+    Stephan Busemann
+    Anna Katrina Dominguez
+    Christian Muirhead
+    James Lan
+    shoma hosaka
+    Daniel Neuhäuser
+    Buck Golemon
+    Konrad Delong
+    Dinu Gherman
+    Chris Lambacher
+    coolbutuseless@gmail.com
+    Jim Baker
+    Rodrigo Araújo
+    Armin Ronacher
+    Brett Cannon
+    yrttyr
+    Zooko Wilcox-O Hearn
+    Tomer Chachamu
+    Christopher Groskopf
+    opassembler.py
+    Antony Lee
+    Jim Hunziker
+    Markus Unterwaditzer
+    Even Wiik Thomassen
+    jbs
+    soareschen
+    Flavio Percoco
+    Kristoffer Kleine
+    yasirs
+    Michael Chermside
+    Anna Ravencroft
+    Andrew Chambers
+    Julien Phalip
+    Dan Loewenherz
 
     Heinrich-Heine University, Germany 
     Open End AB (formerly AB Strakt), Sweden
@@ -287,27 +287,26 @@ The PyPy Logo as used by http://speed.pypy.org and others was created
 by Samuel Reis and is distributed on terms of Creative Commons Share Alike
 License.
  
-License for 'lib-python/2.7.0' and 'lib-python/2.7.0-modified'
-============================================================== 
+License for 'lib-python/2.7'
+============================
 
-Except when otherwise stated (look for LICENSE files or
-copyright/license information at the beginning of each file) the files
-in the 'lib-python/2.7.0' and 'lib-python/2.7.0-modified' directories
-are all copyrighted by the Python Software Foundation and licensed under
-the Python Software License of which you can find a copy here:
+Except when otherwise stated (look for LICENSE files or copyright/license
+information at the beginning of each file) the files in the 'lib-python/2.7'
+directory are all copyrighted by the Python Software Foundation and licensed
+under the Python Software License of which you can find a copy here:
 http://www.python.org/doc/Copyright.html 
 
-License for 'pypy/translator/jvm/src/jna.jar'
+License for 'rpython/translator/jvm/src/jna.jar'
 =============================================
 
-The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU
+The file 'rpyhton/translator/jvm/src/jna.jar' is licensed under the GNU
 Lesser General Public License of which you can find a copy here:
 http://www.gnu.org/licenses/lgpl.html
 
-License for 'pypy/translator/jvm/src/jasmin.jar'
+License for 'rpython/translator/jvm/src/jasmin.jar'
 ================================================
 
-The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer
+The file 'rpyhton/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer
 and distributed with permission.  The use of Jasmin by PyPy does not imply
 that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors.  Furthermore,
 the following disclaimer applies to Jasmin: