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)
commit6e920fbc7d2312a0e87234903bcc0e9ea77bdf26
tree0a8ac68d069f684439a5f595715a3b573257f95c
parent0101b955ca97b90397d510dcf7b0ee6d530c6149
parentc46fe93e3a9f3b5ce44f09acd1bd502cc0017f82
Merge branch 'master' into tizen_2.1