linux build fix
Merge branch 'pripublic' of /Users/zhaot/Work/neutube/ into public