Merge from vendor branch TNF:
authorcheusov <cheusov>
Fri, 27 May 2011 23:52:03 +0000 (23:52 +0000)
committercheusov <cheusov>
Fri, 27 May 2011 23:52:03 +0000 (23:52 +0000)
commitba950243d39757c77ed115f93150d28e623ab603
tree1994e532f6fcf4a8a109f804b07f0c23a7e5da42
parentd0dbca7ec3f3469e0b04bf54fa8a3222b42b3505
parenta4237f9f5caf0fd28c465c89f7c59f6c04e20d57
Merge from vendor branch TNF:

heirloom-psrinfo