Merge branch 'maint-0.2.9' into maint-0.3.2

diff --cc Makefile.am
index 4d2d9d222adf58f6b1635497ad7043d6911e63e6,e4be3f26f9c9d3480f099b8f792677fe366e1a27..34493765dfd9941544927292761ad7c43985ac41
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
        done; \
        for f in $$flavors; do \
                $(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +              $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \
        done; \
        echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
-       ! grep -q FAIL test_network_log/*.trs
+       ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
        @if test ! -d "$$STEM_SOURCE_DIR"; then \