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)
commit4d6618e4233b1fc7e31197d9223fba94bb2bc9f0
treec5aad27e14e735dec7fa6f31caeaa77284e118b0
parent695238c800b090cb75dc1ed303ac652823763ad9
parent61e0ca663b08da939c014fea823a55236e58029c
merged fix for #2572 and #2574 from snapshot