user and group
Merge branch 'master' of gitcafe.com:kavon/Ubuntu4Me
cvs update -d -l