Merge commit '2c13759136951ef0e70a3e3c2b2d3c9a387f7ed9' into haugesund

diff --cc filter/config.Y
index 8916ea9770964183724af1843b89f4adec228679,e6b59cbe99169f54f03a0a4f8446027ad9d00687..f27fbbaaea669a59d8953fbd500208af4e0c1880
--- 1/filter/config.Y
--- 2/filter/config.Y
+++ b/filter/config.Y
@@@ -287,10 -286,9 +287,10 @@@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UN
        DEFINED,
        ADD, DELETE, CONTAINS, RESET,
        PREPEND, FIRST, LAST, LAST_NONAGGREGATED, MATCH,
 +      MIN, MAX,
        EMPTY,
        FILTER, WHERE, EVAL, ATTRIBUTE,
-       BT_ASSERT, BT_TEST_SUITE, BT_CHECK_ASSIGN, BT_TEST_SAME, FORMAT)
+       BT_ASSERT, BT_TEST_SUITE, BT_CHECK_ASSIGN, BT_TEST_SAME, FORMAT, STACKS)
  
  %nonassoc THEN
  %nonassoc ELSE

diff --cc filter/f-inst.c
Simple merge

diff --cc lib/slab.c
Simple merge

diff --cc test/birdtest.c
Simple merge