4625 add cscope output to .gitignore
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3243 Add shadow support to getent(1)
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Dan McDonald <danmcd@omniti.com>
	[illumos-gate merge]

commit 00277c9e43668ff248a12ee635ce125957750373
    3243 Add shadow support to getent(1)
commit 04dfc08aa8f2f35510c97c3e9e543a45d0c5b7af
    4625 add cscope output to .gitignore

Conflicts:
	.gitignore