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)
commitfa354754fac0f37ddf2bb696e04790a406d9ece7
treec1c8c75194a023d03cfe9c0618fdba70548d94e8
parent6e920fbc7d2312a0e87234903bcc0e9ea77bdf26
parentcf01c96da504c5ddec27854aab320208d8371db1
Merge branch 'master' into tizen_2.1