Merge remote-tracking branch 'stevee/core67-merge' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Mar 2013 22:11:17 +0000 (23:11 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Mar 2013 22:11:17 +0000 (23:11 +0100)
commit5627b4c9f276f480dffd93d264288de4b936bad7
treef140966d1a4a2d73a1e535d4b37584672f1e7809
parentdddb9afe1a339fb8a380a93dc5399b8988a26abd
parentcf4657e0091ccee44de0462c77bd64d08aa7b503
Merge remote-tracking branch 'stevee/core67-merge' into next

Conflicts:
make.sh
make.sh