tree 425a2ed5ae42d045ef4b6968d5b89b9c2e644665
parent ad14e9003b9f1070deca0498b341ab3deef3055d
author Garrett Cooper <yanegomi@gmail.com> 1292522708 -0800
committer Garrett Cooper <yanegomi@gmail.com> 1292522708 -0800

Cleanup style and get rid of conflicts problems.

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>