Merge branch 'stable'

Conflicts:
	Makefile

Makefile

@@ -143,7 +143,7 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE)
 	@echo '[check requirements]'
 	$(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT)))
 	$(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[4-9]\|2\.[7-9][0-9])
-	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\(\.[0-9]\+\)\?)
+	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][2-9]\(\.[0-9]\+\)\?)
 	@touch '$@'
 
 define newline

index.html

@@ -655,7 +655,7 @@ USE_OSGPLUGIN(<plugin2>)
     </tr>
     <tr>
         <td><a href="http://sources.redhat.com/automake/">Automake</a></td>
-        <td>≥ 1.10</td>
+        <td>≥ 1.12</td>
     </tr>
     <tr>
         <td><a href="http://www.gnu.org/software/bash/">Bash</a></td>