Merge in exp/alias patches
authorBrian Aker <brian@tangent.org>
Fri, 7 Oct 2011 12:20:02 +0000 (05:20 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 7 Oct 2011 12:20:02 +0000 (05:20 -0700)

Trivial merge