Merge remote-tracking branch 'origin/master'
Tomas Doran [Fri, 17 Feb 2012 07:47:21 +0000 (07:47 +0000)]
* origin/master:
  Fixed wrong app name for socket in non-root config


Trivial merge