From d1d3e711669c1e7fe0b2bb289b3c25b5989b2ca9 Mon Sep 17 00:00:00 2001
From: nhudinhtuan <nhudinhtuan@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3>
Date: Tue, 13 Aug 2013 06:28:46 +0000
Subject: [PATCH] Fix Merge from cocoatutorials/gso13trunk