Alexander Motin a3b3a9752c Fix minor mismerge in r286574.		2015-08-11 12:22:16 +00:00
..
opensolaris	Fix minor mismerge in r286574.	2015-08-11 12:22:16 +00:00