fixed a new bison warning in Ubuntu 13.4

can't help the shift-reduce-conflicts though

:: upstream revision 10805 ::
Added some EBook file types (azw, epub, mobi)

:: upstream revision 10806 ::