merging in some changes from dan
merging in some changes from dan

Merge branch 'diffquery' of ssh://localhost/Users/gits/indxrepo into diffquery3

indx/indx-core,indx/indx-core,indx/indx-core,indx/indx-core,indx/indx-core