Commit 84d3253f86dad6b4f261231935675d35fd964b05

Anthony Green 2012-03-19T23:07:35

Rebase post GCC merge