Merge commit '4720ee35cec23841dfb463de9df85a30f95fada0' 0.1.17 0.2
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 6 May 2010 08:53:58 +0000 (11:53 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 6 May 2010 08:53:58 +0000 (11:53 +0300)
commit2ae6e6122b2ac977dc8b6d552ddd3f576e8f98d2
treef17815d10fced3ffc08376b93e08720132993cd0
parent0482625ac576d456f7a12ed67d8a8f7b71bfd106
parent4720ee35cec23841dfb463de9df85a30f95fada0
Merge commit '4720ee35cec23841dfb463de9df85a30f95fada0'

Conflicts:
tests/signond-tests/signond-tests.cpp
tests/signond-tests/tests.xml
tests/signond-tests/signond-tests.cpp
tests/signond-tests/tests.xml