Testing odd merges#1

Open

nhinds wants to merge 2 commits intodanielhodder:masterfrom

nhinds:master

Commits on Mar 6, 2012

Have fun

danielhodder
authored and
nhinds
committed
Make a breaking commit
nhinds
committed