Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.015606 submit/tizen_2.1/20130424.222721
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 17 Apr 2013 10:03:17 +0000 (13:03 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 17 Apr 2013 10:03:17 +0000 (13:03 +0300)

Trivial merge