Merge branch 'master' into tizen_2.0
authorJinjin Shi <jinjin.shi@samsung.com>
Sat, 12 Jan 2013 10:16:54 +0000 (18:16 +0800)
committerJinjin Shi <jinjin.shi@samsung.com>
Sat, 12 Jan 2013 10:17:12 +0000 (18:17 +0800)
commit12c3838d50f02593737984b1031e23b292c724aa
tree324457525342aa0b57fe94c9ee6b64a0ea59f88d
parentf3846878fb2e4ab0920a06d28976ce6d46d46d76
parent030e8f9af7e1d640e3a97b5bb0b4b4cc999460b5
Merge branch 'master' into tizen_2.0

Change-Id: I6b902d979253f57e0f95ddf5102972ce4aff20b0