Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Sep 2010 13:32:55 +0000 (15:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Sep 2010 13:32:55 +0000 (15:32 +0200)
commit23c6672b8c7c555b1455aebc08b51585770152da
tree62202259a67140d9f9e984df823756fb20c902cd
parent82adcbc03fcd1402c21f554386024f11dee09111
parentb27961e905bdf8d7d67a6a30b51b31f1ddabdf91
Merge branch 'master' into next

Conflicts:
doc/packages-list.txt
doc/packages-list.txt