Merge analyzer from alcap@muon.npl.washington.edu:alcapana.git