From: Cuong Le <metacuong@gmail.com>
Date: Wed, 24 Aug 2011 02:57:50 +0000 (+0700)
Subject: Merge branch 'master' into develop
X-Git-Tag: v1.0.2-4~7^2~1
X-Git-Url: http://git.maemo.org/git/?p=lichviet;a=commitdiff_plain;h=f9f9c2cf9df9d48999ad3e79534d4f12adb3126a

Merge branch 'master' into develop
---

f9f9c2cf9df9d48999ad3e79534d4f12adb3126a