Merge branch 'dolcon-split'
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 03:51:02 +0000 (05:51 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 21 Jul 2007 03:51:02 +0000 (05:51 +0200)
commitd05758f6eda21695e6215d60d28b9747d0b8aaa3
tree2b3b8425f5285d8cdebb0d065d83c2ae59dedcb1
parent7c24b929d54eafd3e84511018658119a0671ad20
parent4b9af9b0c7159f8dce5eb326211e6e099b3b34d6
Merge branch 'dolcon-split'

Conflicts:

po/sv.po
clients/gtk2/Makefile.am
config/util/Makefile.am