Applied patch from  John Ellson <ellson@lucent.com> closing #1646, Daniel
3 files changed