Merge remote-tracking branch 'upstream/master'
authorMichael Pratt <michael@pratt.im>
Sun, 8 Jul 2012 19:52:00 +0000 (15:52 -0400)
committerMichael Pratt <michael@pratt.im>
Sun, 8 Jul 2012 19:52:00 +0000 (15:52 -0400)

Trivial merge