Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 02:54:42 +0000 (11:54 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 02:54:42 +0000 (11:54 +0900)
commitca218e5460bacf49c1e244de1c5ed5a1ee685e34
tree4b92d0499b2597f3372d2efe97c8fff2a1eb37b3
parentb97359d4509e343defcf61f744b806b751579704
parent30e5d4474a53d2f4ec3675098ae2348669d1b08c
Merge branch 'master' into release