Fix beamer frame conversion
Merge branch 'master' of git://git.lyx.org/lyx

# By Juergen Spitzmueller
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  Fix beamer frame conversion