Comment 34 for bug 1012081

Adam Conrad has been working on this.