tree e1d454e6994db8af3a74d7ab4c71b37c99f2b20e
parent cd831787dd56705e87d179c5f34309873c84576f
author apanchenk <apanchenk> 1257942430 +0000
committer apanchenk <apanchenk> 1257942430 +0000

merged from HEAD: fix for 294696