Merge branch 'master' into tizen_2.0
authorJinjin Shi <jinjin.shi@samsung.com>
Fri, 21 Dec 2012 13:03:39 +0000 (21:03 +0800)
committerJinjin Shi <jinjin.shi@samsung.com>
Fri, 21 Dec 2012 13:05:53 +0000 (21:05 +0800)
commitf3846878fb2e4ab0920a06d28976ce6d46d46d76
tree146d93c3c62a1e49d7899731831918c65993b33a
parent95c013c36c4e570f21ccb389c58db2d67dbd5897
parentb16e6564692b944945379b578aed83791102bf53
Merge branch 'master' into tizen_2.0

Change-Id: Id3a84c2f9fd78b23dc494c73344d2716612f0e9c