Merge commit 'juri/juha-devel'
authorRiku Voipio <riku.voipio@nokia.com>
Thu, 2 Apr 2009 15:22:16 +0000 (18:22 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Thu, 2 Apr 2009 15:22:16 +0000 (18:22 +0300)
commitd5e701af471d8a917043a75e92534f66f82d4394
tree8ee1df4b84958b0bd8e0629acbb38b2a433cc32f
parent56246a2af2b00bb9f4741fa656c5bffec1d27cae
parentbcebc4a2e92679c5d10f7b5d20269de2ef3d782c
Merge commit 'juri/juha-devel'