Merge remote-tracking branch 'gabithume/146_debug_message'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 11 May 2013 15:19:31 +0000 (10:19 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 11 May 2013 15:19:31 +0000 (10:19 -0500)

Trivial merge