merging TotoroBeta to trunk with minor changes to the plugger logic
merging TotoroBeta to trunk with minor changes to the plugger logic

git-svn-id: dcdaf592c419a47799209c32700ba59719f9e900@6307 acfa968b-e9c4-4993-a9e6-846a59bbf143

albireox/Totoro,ApachePointObservatory/Totoro