Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 13 Aug 2010 14:02:31 +0000 (17:02 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 13 Aug 2010 14:02:31 +0000 (17:02 +0300)
commitfd572b44ecfe404157623700c56d9c3adcbe7221
tree3b8878c785167af506d4af7d52b51e3128e8b7cf
parent2929fde9579e72c779de970e00f9f88c1b7075f0
parent0060f03c2e103fcef31c20a60d8c93d4746547f9
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

Conflicts:
src/ui/indicatorbuttonpanel.cpp