merge trunk 17213:17221
authorMartin Poirier <theeth@yahoo.com>
Wed, 29 Oct 2008 19:14:59 +0000 (19:14 +0000)
committerMartin Poirier <theeth@yahoo.com>
Wed, 29 Oct 2008 19:14:59 +0000 (19:14 +0000)

Trivial merge