Merge gitorious.org:snowdrift/snowdrift
Merge gitorious.org:snowdrift/snowdrift
previous typo wasn't fixed in Joe's version when he updated, so fix needed refixing