 r3539@Blasphemy:  kern | 2005-09-29 03:12:18 -0700  Bit of a merge conflict.
 r3539@Blasphemy:  kern | 2005-09-29 03:12:18 -0700
 Bit of a merge conflict.

drasmuss/numpy,ViralLeadership/numpy,nbeaver/numpy,SiccarPoint/numpy,behzadnouri/numpy,dato-code/numpy,rudimeier/numpy,numpy/numpy,ewmoore/numpy,dimasad/numpy,rudimeier/numpy,jorisvandenbossche/numpy,cjermain/numpy,rgommers/numpy,ContinuumIO/numpy,mattip/numpy,pelson/numpy,has2k1/numpy,CMartelLML/numpy,SunghanKim/numpy,dwillmer/numpy,skymanaditya1/numpy,MaPePeR/numpy,embray/numpy,jakirkham/numpy,madphysicist/numpy,simongibbons/numpy,nbeaver/numpy,dch312/numpy,sinhrks/numpy,charris/numpy,ssanderson/numpy,BMJHayward/numpy,dwillmer/numpy,moreati/numpy,mattip/numpy,ogrisel/numpy,Eric89GXL/numpy,chatcannon/numpy,tdsmith/numpy,gmcastil/numpy,grlee77/numpy,jschueller/numpy,joferkington/numpy,WarrenWeckesser/numpy,cowlicks/numpy,numpy/numpy-refactor,sigma-random/numpy,anntzer/numpy,mortada/numpy,rgommers/numpy,ChanderG/numpy,musically-ut/numpy,mingwpy/numpy,rhythmsosad/numpy,madphysicist/numpy,numpy/numpy-refactor,naritta/numpy,chatcannon/numpy,ViralLeadership/numpy,endolith/numpy,stuarteberg/numpy,endolith/numpy,endolith/numpy,madphysicist/numpy,mindw/numpy,utke1/numpy,ahaldane/numpy,dch312/numpy,tacaswell/numpy,tacaswell/numpy,tynn/numpy,jankoslavic/numpy,ajdawson/numpy,musically-ut/numpy,skwbc/numpy,githubmlai/numpy,Linkid/numpy,nguyentu1602/numpy,hainm/numpy,rmcgibbo/numpy,abalkin/numpy,andsor/numpy,tynn/numpy,chiffa/numpy,SunghanKim/numpy,Anwesh43/numpy,mhvk/numpy,maniteja123/numpy,stefanv/numpy,rgommers/numpy,nguyentu1602/numpy,immerrr/numpy,utke1/numpy,rudimeier/numpy,bertrand-l/numpy,solarjoe/numpy,bertrand-l/numpy,Srisai85/numpy,kirillzhuravlev/numpy,gmcastil/numpy,pelson/numpy,pbrod/numpy,ViralLeadership/numpy,grlee77/numpy,shoyer/numpy,GrimDerp/numpy,ogrisel/numpy,seberg/numpy,rmcgibbo/numpy,Srisai85/numpy,jschueller/numpy,yiakwy/numpy,ssanderson/numpy,ChanderG/numpy,pyparallel/numpy,numpy/numpy,numpy/numpy,AustereCuriosity/numpy,matthew-brett/numpy,ekalosak/numpy,nguyentu1602/numpy,rajathkumarmp/numpy,charris/numpy,rmcgibbo/numpy,astrofrog/numpy,joferkington/numpy,shoyer/numpy,madphysicist/numpy,bertrand-l/numpy,skwbc/numpy,groutr/numpy,ddasilva/numpy,mindw/numpy,chatcannon/numpy,mhvk/numpy,pelson/numpy,CMartelLML/numpy,jschueller/numpy,rmcgibbo/numpy,maniteja123/numpy,felipebetancur/numpy,simongibbons/numpy,ChristopherHogan/numpy,naritta/numpy,jonathanunderwood/numpy,dwf/numpy,MSeifert04/numpy,gmcastil/numpy,AustereCuriosity/numpy,dch312/numpy,rhythmsosad/numpy,jakirkham/numpy,bringingheavendown/numpy,pbrod/numpy,KaelChen/numpy,Srisai85/numpy,ESSS/numpy,skwbc/numpy,moreati/numpy,behzadnouri/numpy,pizzathief/numpy,kirillzhuravlev/numpy,githubmlai/numpy,ChristopherHogan/numpy,astrofrog/numpy,andsor/numpy,bringingheavendown/numpy,embray/numpy,BMJHayward/numpy,bmorris3/numpy,dwf/numpy,simongibbons/numpy,BabeNovelty/numpy,jankoslavic/numpy,BabeNovelty/numpy,groutr/numpy,empeeu/numpy,kiwifb/numpy,jorisvandenbossche/numpy,jankoslavic/numpy,ewmoore/numpy,dwillmer/numpy,felipebetancur/numpy,immerrr/numpy,dimasad/numpy,pyparallel/numpy,immerrr/numpy,pyparallel/numpy,KaelChen/numpy,dwillmer/numpy,grlee77/numpy,sonnyhu/numpy,mathdd/numpy,ContinuumIO/numpy,seberg/numpy,rherault-insa/numpy,WillieMaddox/numpy,solarjoe/numpy,astrofrog/numpy,tacaswell/numpy,cowlicks/numpy,mingwpy/numpy,jonathanunderwood/numpy,leifdenby/numpy,Eric89GXL/numpy,Dapid/numpy,chiffa/numpy,ChanderG/numpy,pelson/numpy,charris/numpy,AustereCuriosity/numpy,tdsmith/numpy,GaZ3ll3/numpy,githubmlai/numpy,ESSS/numpy,pizzathief/numpy,trankmichael/numpy,mattip/numpy,shoyer/numpy,mortada/numpy,embray/numpy,Eric89GXL/numpy,Anwesh43/numpy,SiccarPoint/numpy,jakirkham/numpy,matthew-brett/numpy,dwf/numpy,bringingheavendown/numpy,felipebetancur/numpy,BMJHayward/numpy,maniteja123/numpy,joferkington/numpy,SiccarPoint/numpy,pdebuyl/numpy,Linkid/numpy,Yusa95/numpy,numpy/numpy,drasmuss/numpy,GrimDerp/numpy,ekalosak/numpy,mwiebe/numpy,ekalosak/numpy,ajdawson/numpy,mathdd/numpy,madphysicist/numpy,endolith/numpy,gfyoung/numpy,shoyer/numpy,trankmichael/numpy,hainm/numpy,numpy/numpy-refactor,naritta/numpy,ahaldane/numpy,dimasad/numpy,stuarteberg/numpy,rherault-insa/numpy,b-carter/numpy,trankmichael/numpy,naritta/numpy,CMartelLML/numpy,ekalosak/numpy,BMJHayward/numpy,ChristopherHogan/numpy,pbrod/numpy,njase/numpy,matthew-brett/numpy,pelson/numpy,musically-ut/numpy,dimasad/numpy,kirillzhuravlev/numpy,seberg/numpy,larsmans/numpy,ogrisel/numpy,pdebuyl/numpy,moreati/numpy,tdsmith/numpy,MSeifert04/numpy,has2k1/numpy,grlee77/numpy,ewmoore/numpy,skymanaditya1/numpy,groutr/numpy,stefanv/numpy,WillieMaddox/numpy,empeeu/numpy,ddasilva/numpy,ssanderson/numpy,yiakwy/numpy,bmorris3/numpy,NextThought/pypy-numpy,njase/numpy,ewmoore/numpy,sonnyhu/numpy,Dapid/numpy,mwiebe/numpy,ChanderG/numpy,kiwifb/numpy,jorisvandenbossche/numpy,joferkington/numpy,immerrr/numpy,SunghanKim/numpy,sinhrks/numpy,numpy/numpy-refactor,charris/numpy,skymanaditya1/numpy,stefanv/numpy,MichaelAquilina/numpy,sonnyhu/numpy,cowlicks/numpy,Srisai85/numpy,GaZ3ll3/numpy,anntzer/numpy,pdebuyl/numpy,pdebuyl/numpy,rgommers/numpy,rajathkumarmp/numpy,mhvk/numpy,WarrenWeckesser/numpy,yiakwy/numpy,ewmoore/numpy,argriffing/numpy,solarjoe/numpy,ogrisel/numpy,dwf/numpy,felipebetancur/numpy,simongibbons/numpy,Dapid/numpy,ahaldane/numpy,sigma-random/numpy,skymanaditya1/numpy,argriffing/numpy,andsor/numpy,sinhrks/numpy,sinhrks/numpy,mathdd/numpy,NextThought/pypy-numpy,NextThought/pypy-numpy,has2k1/numpy,grlee77/numpy,dato-code/numpy,mingwpy/numpy,gfyoung/numpy,gfyoung/numpy,nguyentu1602/numpy,matthew-brett/numpy,mwiebe/numpy,tynn/numpy,WarrenWeckesser/numpy,stuarteberg/numpy,ahaldane/numpy,WarrenWeckesser/numpy,githubmlai/numpy,kirillzhuravlev/numpy,hainm/numpy,stefanv/numpy,GrimDerp/numpy,rajathkumarmp/numpy,argriffing/numpy,jorisvandenbossche/numpy,embray/numpy,astrofrog/numpy,MichaelAquilina/numpy,cowlicks/numpy,sigma-random/numpy,seberg/numpy,pizzathief/numpy,mingwpy/numpy,stuarteberg/numpy,bmorris3/numpy,GaZ3ll3/numpy,MaPePeR/numpy,BabeNovelty/numpy,NextThought/pypy-numpy,ahaldane/numpy,has2k1/numpy,Anwesh43/numpy,ESSS/numpy,anntzer/numpy,hainm/numpy,Yusa95/numpy,ContinuumIO/numpy,Linkid/numpy,WarrenWeckesser/numpy,ajdawson/numpy,dwf/numpy,abalkin/numpy,MaPePeR/numpy,jorisvandenbossche/numpy,mortada/numpy,Eric89GXL/numpy,cjermain/numpy,tdsmith/numpy,mindw/numpy,MSeifert04/numpy,yiakwy/numpy,SiccarPoint/numpy,mattip/numpy,pbrod/numpy,dch312/numpy,jakirkham/numpy,behzadnouri/numpy,KaelChen/numpy,andsor/numpy,bmorris3/numpy,Linkid/numpy,matthew-brett/numpy,leifdenby/numpy,jschueller/numpy,sonnyhu/numpy,trankmichael/numpy,chiffa/numpy,anntzer/numpy,ddasilva/numpy,rudimeier/numpy,empeeu/numpy,CMartelLML/numpy,rherault-insa/numpy,larsmans/numpy,MaPePeR/numpy,astrofrog/numpy,brandon-rhodes/numpy,KaelChen/numpy,WillieMaddox/numpy,ogrisel/numpy,kiwifb/numpy,SunghanKim/numpy,pizzathief/numpy,utke1/numpy,dato-code/numpy,jankoslavic/numpy,cjermain/numpy,BabeNovelty/numpy,mhvk/numpy,drasmuss/numpy,jonathanunderwood/numpy,brandon-rhodes/numpy,musically-ut/numpy,MichaelAquilina/numpy,ChristopherHogan/numpy,nbeaver/numpy,pizzathief/numpy,rhythmsosad/numpy,MSeifert04/numpy,rhythmsosad/numpy,mortada/numpy,sigma-random/numpy,b-carter/numpy,mindw/numpy,rajathkumarmp/numpy,abalkin/numpy,brandon-rhodes/numpy,MSeifert04/numpy,larsmans/numpy,mhvk/numpy,b-carter/numpy,Yusa95/numpy,simongibbons/numpy,GaZ3ll3/numpy,stefanv/numpy,embray/numpy,empeeu/numpy,numpy/numpy-refactor,Yusa95/numpy,ajdawson/numpy,pbrod/numpy,larsmans/numpy,MichaelAquilina/numpy,leifdenby/numpy,mathdd/numpy,shoyer/numpy,jakirkham/numpy,brandon-rhodes/numpy,dato-code/numpy,njase/numpy,GrimDerp/numpy,cjermain/numpy,Anwesh43/numpy