Merge branch 'master' into kinetic
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 17 Jun 2010 11:16:20 +0000 (14:16 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 17 Jun 2010 11:16:20 +0000 (14:16 +0300)
commit6da8190e05a53d0c1616ae704183c620379050a4
treed7f89d67f9180854d39a9e50b8f64bd2c13c154e
parentc7c0da19a9975794ae1b02c9366afec786786968
parent05eaf7bb2fe1dc07d957cc9af96453db49de371e
Merge branch 'master' into kinetic

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