Merged Gianluca's fix of my version of Eric's patch ;)
authorW. Trevor King <wking@drexel.edu>
Wed, 10 Feb 2010 09:50:20 +0000 (04:50 -0500)
committerW. Trevor King <wking@drexel.edu>
Wed, 10 Feb 2010 09:50:20 +0000 (04:50 -0500)

Trivial merge