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

# By Juergen Spitzmueller
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  Adjust FIXME