Merge branch 'develop' into tizen_qemu_1.5.1
authortest <test@test.(none)>
Tue, 2 Jul 2013 08:30:26 +0000 (17:30 +0900)
committertest <test@test.(none)>
Tue, 2 Jul 2013 08:30:26 +0000 (17:30 +0900)

Trivial merge