fpi2 files from /group/fpi/tanja/Analyzer.KEEPME.17.JULY.2007
Merge pull request #8 from MarkKJones/newfpi2

fpi2 files from /group/fpi/tanja/Analyzer.KEEPME.17.JULY.2007