Merge branch 'master' into separate_search_panel
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 10:15:01 +0000 (13:15 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 10:15:01 +0000 (13:15 +0300)
commitf0a0f8ce919bd1b2579d9b9c9ee5ef8b3beaf0f2
tree129d7a129b8bc66d8dd8d09e9fb9cbbe53b497bd
parent626d9f94d139acc7606e3e04e7e944bbadd464b1
parentdfc410b637a30eb32b7a0c9ffdbd0dfbc766a794
Merge branch 'master' into separate_search_panel

Conflicts:
src/src.pro
src/src.pro