Merge from vendor branch TNF:
authorcheusov <cheusov>
Sat, 28 May 2011 08:45:35 +0000 (08:45 +0000)
committercheusov <cheusov>
Sat, 28 May 2011 08:45:35 +0000 (08:45 +0000)
commit054204f952a5004cf36ddd216aa2df181c3e6397
tree3b3e57fcc509c15c94fc9f7ef6fad5cde9cd86a4
parent5316ffccaf60bbb93c573aa7c1b494f75d81cd0f
parentfe48cfcebd016657cbcd8b1d220cbe20f19cf218
Merge from vendor branch TNF:

heirloom part