Merging changes from snapshot_3.0.9 to fix bug #2235
authorl.morris <l.morris@localhost>
Tue, 31 Jan 2012 16:42:36 +0000 (16:42 +0000)
committerl.morris <l.morris@localhost>
Tue, 31 Jan 2012 16:42:36 +0000 (16:42 +0000)

Trivial merge