commmit from crunchbang on aoa150