Merge pull request #853 from laanwj/2012_02_altminimizetray