Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:15:44 +0000 (19:15 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:15:44 +0000 (19:15 +0900)
commit42cc113dae61768cf7949d20451bd7ef1bf35cf9
treee851cfd51202f999d71c927496f06c6a1dfb085b
parentbbca61096a1db7fc450da41864bd803d5e54b502
parentc8d0146847fe690855dd4ba4a320135052b24766
Merge branch 'master' into release