Merge remote-tracking branch 'tizendev/master' into tizen_2.1_smack
authorRafal Krypa <r.krypa@samsung.com>
Fri, 3 May 2013 11:54:59 +0000 (13:54 +0200)
committerRafal Krypa <r.krypa@samsung.com>
Fri, 3 May 2013 11:54:59 +0000 (13:54 +0200)

Trivial merge