[Merge] lp:~rcj/ubuntu/trusty/open-vm-tools/trusty-proposed into lp:ubuntu/trusty/open-vm-tools

[Robert C Jennings]

debdiff @ http://paste.ubuntu.com/7656026/
-- 
https://code.launchpad.net/~rcj/ubuntu/trusty/open-vm-tools/trusty-proposed/+merge/223331
Your team Ubuntu branches is requested to review the proposed merge of lp:~rcj/ubuntu/trusty/open-vm-tools/trusty-proposed into lp:ubuntu/trusty/open-vm-tools.