Merge "tools: Fix for $LOGNAME missing in Ubuntu 11.10, using $USER instead" into gingerbread