Merge remote-tracking branch 'antono/fix-xterm-plugin'
authorTravis Swicegood <development@domain51.com>
Tue, 13 Mar 2012 14:32:11 +0000 (07:32 -0700)
committerTravis Swicegood <development@domain51.com>
Tue, 13 Mar 2012 14:32:11 +0000 (07:32 -0700)

Trivial merge