merged fix for #2572 and #2574 from snapshot
authorl.morris <l.morris@localhost>
Thu, 26 Jan 2012 13:33:44 +0000 (13:33 +0000)
committerl.morris <l.morris@localhost>
Thu, 26 Jan 2012 13:33:44 +0000 (13:33 +0000)

Trivial merge