Merge branch 'neon'
authorDavid Schleef <ds@schleef.org>
Wed, 12 May 2010 20:42:54 +0000 (13:42 -0700)
committerDavid Schleef <ds@schleef.org>
Wed, 12 May 2010 20:42:54 +0000 (13:42 -0700)

Trivial merge