Merge branch 'core40'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 20:37:13 +0000 (22:37 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Sep 2010 20:37:13 +0000 (22:37 +0200)
commit2ab07f7ef331663a44757e82d6d16c325da6e092
treeba14d01ef2e587fabcee9bb73224901aae6fabb5
parentd003cffe573eb68ca3a82de35605e75f84023636
parent7f5b009ad57926e217df66988513a81f05fb539b
Merge branch 'core40'