rebranch from 2.5
authorJoseph Eagar <joeedh@gmail.com>
Wed, 7 Jan 2009 15:16:12 +0000 (15:16 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Wed, 7 Jan 2009 15:16:12 +0000 (15:16 +0000)

Trivial merge