FS#1278 - Menubar should check all standard directories
Added local desktop directory to list of directories parsed by menubar
by using the XDG specification
Merge branch 'master' of git://github.com/tusj/awesome