From 7f4235802f6db0669766864a1b95e91805902eea Mon Sep 17 00:00:00 2001
From: visitor83 <wolflouiswang@gmail.com>
Date: Tue, 18 Jun 2013 10:11:10 +0800
Subject: [PATCH] Merge branch 'master', remote branch
 'remotes/BernardXiong/master'