copying 2.5 over to trunk
authorMartin Poirier <theeth@yahoo.com>
Sat, 12 Sep 2009 12:58:52 +0000 (12:58 +0000)
committerMartin Poirier <theeth@yahoo.com>
Sat, 12 Sep 2009 12:58:52 +0000 (12:58 +0000)

Trivial merge