Fix Bugs in Ubuntu 1304
Merge branch 'smartlink_svr'