Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Apr 2010 22:19:44 +0000 (00:19 +0200)
commit0a8db55873838c67f045d4124f566451019622a8
tree9058099d95f2119adcdf0e3cde8c0c04bf2b09aa
parent4e7418a998b81ff540a3cebbbe9736267c8b6e73
parent5487c71bbe42254d7eb384a3dbaa6ac2061df729
Merge branch 'next'

Conflicts:
config/rootfiles/core/37/filelists/files
config/rootfiles/packages/gutenprint
doc/packages-list.txt
src/pakfire/lib/functions.sh
config/rootfiles/oldcore/37/update.sh
config/rootfiles/packages/gutenprint
make.sh