Merge with the master
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 18 Mar 2013 08:56:27 +0000 (17:56 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 18 Mar 2013 08:56:27 +0000 (17:56 +0900)
commitc8bdbb20e08994849352fa50eb8823b718d33336
tree845e074f899232b6438f661ce2a9df8cddf47352
parentcfab5ec1a32a0e77e71420cf4e7025dda4963800
parentcba5e2c94029e3da34ce7ce2bcc7e7d4e73e7958
Merge with the master