Merge branch 'dev' of https://vcs.maemo.org/git/situare into dev
authorJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 22 Apr 2010 08:39:27 +0000 (11:39 +0300)
committerJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 22 Apr 2010 08:39:27 +0000 (11:39 +0300)
1  2 
src/src.pro

diff --cc src/src.pro
Simple merge