Merge branch 'intefl/svn_merge' of 165.213.149.219:/slp/pkgs/e/elementary into intefl...
authorminseok3.kim <minseok3.kim@samsung.com>
Thu, 8 Mar 2012 12:14:17 +0000 (21:14 +0900)
committerminseok3.kim <minseok3.kim@samsung.com>
Thu, 8 Mar 2012 12:14:17 +0000 (21:14 +0900)

Trivial merge