Merge branch 'master' into tizen_2.2 2.2.1_release 2.2_release submit/tizen_2.2/20130718.092124
authorMarko Ollonen <marko.ollonen@ixonos.com>
Wed, 26 Jun 2013 09:38:59 +0000 (12:38 +0300)
committerMarko Ollonen <marko.ollonen@ixonos.com>
Wed, 26 Jun 2013 09:38:59 +0000 (12:38 +0300)

Trivial merge