Merge remote-tracking branch 'aeva/671_fix_stl'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 25 Mar 2013 13:01:11 +0000 (08:01 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 25 Mar 2013 13:01:11 +0000 (08:01 -0500)

Trivial merge