Merge branch 'master' into neon
authorDavid Schleef <ds@schleef.org>
Thu, 25 Jun 2009 01:21:23 +0000 (18:21 -0700)
committerDavid Schleef <ds@schleef.org>
Thu, 25 Jun 2009 01:21:23 +0000 (18:21 -0700)

Trivial merge