commit 30a398875663d66767cd745c0df43689eb643a7d Merge: 1ef505f b772dfd Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Thu Aug 28 17:40:02 2014 +1000 Merge branch 'el6' ---