Merge branch 'extras-devel-package'
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 11:38:55 +0000 (14:38 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 11:38:55 +0000 (14:38 +0300)
commitf19b45657b5a92cfae95cadd994d4959f35b4074
treebf2b986efe58de0b33ae9052b5940862b0931210
parentb68973300bf05f75957a39e1e116469988c10a8f
parent4ffc1c7fa21a613d6b753cb98a05228b392a7f2d
Merge branch 'extras-devel-package'

Conflicts:
debian/changelog
debian/changelog
src/src.pro