Merge branch 'master' into tizen_2.1
authorMarko Ollonen <marko.ollonen@ixonos.com>
Fri, 24 May 2013 10:41:05 +0000 (13:41 +0300)
committerMarko Ollonen <marko.ollonen@ixonos.com>
Fri, 24 May 2013 10:41:05 +0000 (13:41 +0300)

Trivial merge