Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)
commit846571ac8455c663fc75b0970eb76c4a92eea3be
tree6c1f1153bd725fbdacc9a165db4b54b11ef25392
parentf55596ee38abe00753d06482f0616500be20cd87
parent7107b3042cc5aad129ddaddc01b7975e5717334e
Merge commit 'origin/master' into next