• Fix merge errors from the refactor-gfx merge.

    @metajack
    metajack committed Apr 18, 2013
    076a43b