Comment 13 for bug 1012794

Uploaded to -proposed for SRU team review.