Merge in backtrace
authorBrian Aker <brian@tangent.org>
Wed, 20 Jul 2011 01:03:52 +0000 (18:03 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 20 Jul 2011 01:03:52 +0000 (18:03 -0700)

Trivial merge