merged 28477:29285 from trunk
authorMike Erwin <significant.bit@gmail.com>
Mon, 7 Jun 2010 00:08:01 +0000 (00:08 +0000)
committerMike Erwin <significant.bit@gmail.com>
Mon, 7 Jun 2010 00:08:01 +0000 (00:08 +0000)

Trivial merge