Merge branch 'master' into tizen_2.1
authorMarko Ollonen <marko.ollonen@ixonos.com>
Mon, 27 May 2013 12:09:33 +0000 (15:09 +0300)
committerMarko Ollonen <marko.ollonen@ixonos.com>
Mon, 27 May 2013 12:09:33 +0000 (15:09 +0300)

Trivial merge