Merge remote-tracking branch 'elrond/for-schendje'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 18:50:17 +0000 (12:50 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 18:50:17 +0000 (12:50 -0600)

Trivial merge