Merge branch 'libsatsolver' into next

diff --cc make.sh
index 8c08fc34cb8384708c1f06aea8f1303eab1b78c8,30023e599a82f5242141c7d644d921ca1c3aabc7..b73cc72f961883adeaa6ff4fd1c41a330262a00a
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -690,10 -689,8 +690,9 @@@ buildipfire() 
    ipfiremake parted
    ipfiremake swig
    ipfiremake python-m2crypto
 +  ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
-   ipfiremake python-satsolver
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar