changes from linux-grouper