For Elementary 1.0 migration
authorJeonghyun Yun <jh0506.yun@samsung.com>
Tue, 13 Mar 2012 01:52:26 +0000 (10:52 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Tue, 13 Mar 2012 02:38:09 +0000 (11:38 +0900)
Merge remote-tracking branch 'remotes/origin/intefl/svn_merge'


Trivial merge