Fix for r1054
Fix for r1054

Kyle checked in SVN conflict in configure.ac


njwilson23/StereoPipeline,NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline,ScottMcMichael/StereoPipeline,ScottMcMichael/StereoPipeline,aaronknister/StereoPipeline,ScottMcMichael/StereoPipeline,njwilson23/StereoPipeline,DougFirErickson/StereoPipeline,aaronknister/StereoPipeline,aaronknister/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,DougFirErickson/StereoPipeline,DougFirErickson/StereoPipeline,njwilson23/StereoPipeline,DougFirErickson/StereoPipeline,njwilson23/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,njwilson23/StereoPipeline,oleg-alexandrov/StereoPipeline,ScottMcMichael/StereoPipeline,aaronknister/StereoPipeline,NeoGeographyToolkit/StereoPipeline,njwilson23/StereoPipeline,aaronknister/StereoPipeline,DougFirErickson/StereoPipeline,ScottMcMichael/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,NeoGeographyToolkit/StereoPipeline,DougFirErickson/StereoPipeline