Merge branch 'master' of git://orodu.net/openbox