backport 2009-02-26  Peter Bergner  <[email protected]>
2 files changed