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)
commit20cc04a8b533c680f4e7e374f1bc9fcbc605a82e
treee1329e91be9675e1978eb9e26ea8197162cc6751
parentcb96f2abc6d0ea364adfcc57f8e455a336981fc6
parent4842663f316dda28e89bd7297d8b682400770571
Merge changes I6abbe506,Ibfd12197

* changes:
  [list] opensource merge (r69555)
  [list] Opensource Merge (r69535)