Merging 17824:17845 from trunk to blocking branch.
authorMatt Amos <zerebubuth@gmail.com>
Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)

Trivial merge