Comment 5 for bug 1035806

The merge proposal has now closed itself.
In the ubuntu-defaults-builder, I had to modify the test-suite to sort os.listdir before comparing the values, since by default they are returned in an arbitrary order. Please check if that is OK.