Merge remote-tracking branch 'rsa/tizen_2.1' into rsa_master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 12 Apr 2013 14:05:43 +0000 (16:05 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Fri, 12 Apr 2013 14:05:50 +0000 (16:05 +0200)
Change-Id: I15d1549c23d65fa677c10065dd5880647c4a3060


Trivial merge