Merge branches 'bugfixes' and 'master'
authorJukka Kinnunen <jukka.kinnunen@tieto.com>
Fri, 18 Mar 2011 08:34:50 +0000 (10:34 +0200)
committerJukka Kinnunen <jukka.kinnunen@tieto.com>
Fri, 18 Mar 2011 08:34:50 +0000 (10:34 +0200)
commit9c0f6beaf58075d44de942eb66071213f31587f5
treeedde3cbb5d63be6f617a965962e3aac197df1b0d
parentbe85552e2d484825022615c43988abce5985bd3c
Merge branches 'bugfixes' and 'master'