Merge branch 'tizen_2.2'
authorjuho <juho80.son@samsung.com>
Mon, 15 Jul 2013 15:26:55 +0000 (00:26 +0900)
committerjuho <juho80.son@samsung.com>
Mon, 15 Jul 2013 15:27:05 +0000 (00:27 +0900)
Change-Id: I74bce5d56475bc6b9b8a4fdef930fe8e70abb0b5


Trivial merge