Merge default.
authorNed Deily <nad@acm.org>
Wed, 29 Jun 2011 03:16:55 +0000 (20:16 -0700)
committerNed Deily <nad@acm.org>
Wed, 29 Jun 2011 03:16:55 +0000 (20:16 -0700)

Trivial merge