Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Fri, 30 Mar 2007 19:56:08 +0000 (12:56 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 30 Mar 2007 19:56:08 +0000 (12:56 -0700)

Trivial merge