Merge branch 'master' into smf+compile
authorDan Vanderkam <danvdk@gmail.com>
Wed, 23 Oct 2013 18:00:52 +0000 (13:00 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Wed, 23 Oct 2013 18:00:52 +0000 (13:00 -0500)

Trivial merge