Merge "Merge master into tizen_2.1 for Slider and EEA" into tizen_2.1
authorAyush Srivastava <ayush.sriv@tizendev.org>
Tue, 21 May 2013 13:30:09 +0000 (22:30 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 21 May 2013 13:30:09 +0000 (22:30 +0900)

Trivial merge