Merge changes I6abbe506,Ibfd12197
authorShinwoo Kim <cinoo.kim@samsung.com>
Tue, 27 Mar 2012 08:40:49 +0000 (17:40 +0900)
committerGerrit Code Review <gerrit2@localhost>
Tue, 27 Mar 2012 08:40:49 +0000 (17:40 +0900)
* changes:
  [list] opensource merge (r69555)
  [list] Opensource Merge (r69535)


Trivial merge