Merge branch 'patches/050_ck_patch' into patches/060_speeling
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:02:25 +0000 (23:02 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:02:25 +0000 (23:02 +0000)

Trivial merge