Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Oct 2010 16:38:27 +0000 (18:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Oct 2010 16:38:27 +0000 (18:38 +0200)
commit650b057076a8cfe7f6987573a866911472a26c08
tree5950b05ecddbe8c7c051cdd0382878347dd614a6
parent79524818a2a788aa34ce6478b79584a50602198a
parent52b0f81319522ecb780465ca69a8d319415bb4eb
Merge commit 'origin/master' into next