• Fix build errors after rebase.

    @jdm
    jdm committed Apr 23, 2013
    bc26b46