Merge from vendor branch TNF:
authorcheusov <cheusov>
Sat, 28 May 2011 00:15:13 +0000 (00:15 +0000)
committercheusov <cheusov>
Sat, 28 May 2011 00:15:13 +0000 (00:15 +0000)
commit383f882a86b39423ac1422d0c38cf71584034ede
tree5bdf9910ac78ed5ded142f32e9e92bd26aba8b71
parent838fa9c02673ab03cc10503a2737639cff111327
parent73a2ca6583b9defda0c71d5f767a21d0420494a8
Merge from vendor branch TNF:

heirloom-utility