Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Fri, 30 Mar 2007 20:18:27 +0000 (13:18 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 30 Mar 2007 20:18:27 +0000 (13:18 -0700)

Trivial merge