Merge "Elementary migration revision 70341 Merge remote branch 'remotes/origin/upstream'"
authorShinwoo Kim <cinoo.kim@samsung.com>
Fri, 20 Apr 2012 01:23:29 +0000 (10:23 +0900)
committerGerrit Code Review <gerrit2@localhost>
Fri, 20 Apr 2012 01:23:29 +0000 (10:23 +0900)

Trivial merge