Merge 0.9->trunk

diff --cc core/configmanager.lua
Simple merge

diff --cc util-src/pposix.c
Simple merge

diff --cc util/set.lua
index b9e9ef217c25d4f8d55e37853d0788ee863eb061,e9dfec1bca729b509040e785248389187dca8abd..a2df669c05e97706b8d6120cddece71a8a5d73b7
--- 1/util/set.lua
--- 2/util/set.lua
+++ b/util/set.lua
@@@ -89,9 -89,9 +89,9 @@@ function new(list
                        end
                end
        end
-       
+ 
        function set:include(otherset)
 -              for item in pairs(otherset) do
 +              for item in otherset do
                        items[item] = true;
                end
        end