Whitespace
Merge branch 'master' of git://git.lyx.org/lyx into my_two_cents

# By Jean-Marc Lasgouttes
# Via Jean-Marc Lasgouttes
* 'master' of git://git.lyx.org/lyx:
  Whitespace