Backed out changeset cf35c8eac882 (bug 1003766) for Werror bustage.
CLOSED TREE