Merge branch 'master' into tizen_2.1
authorjuho <juho80.son@samsung.com>
Fri, 12 Apr 2013 09:07:42 +0000 (18:07 +0900)
committerjuho <juho80.son@samsung.com>
Fri, 12 Apr 2013 09:07:42 +0000 (18:07 +0900)
Change-Id: I2c23586a3d7da8977774954afb5deb57c8b103f4


Trivial merge