Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.022326 submit/tizen_2.1/20130424.235524
authorjuho <juho80.son@samsung.com>
Tue, 19 Mar 2013 09:01:55 +0000 (18:01 +0900)
committerjuho <juho80.son@samsung.com>
Tue, 19 Mar 2013 09:02:38 +0000 (18:02 +0900)
Change-Id: I042b2b5688ff9d37ae62262c0f4131c4c12c5e22


Trivial merge