Alexandre Julliard : Merge branch 'lxr'.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: d8bd93ef76a21dfd186c192e9246ae8b483d7cd7
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=d8bd93ef76a21dfd186c192e9...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Jun 27 13:34:29 2014 +0200

Merge branch 'lxr'.

---