Sync changes from HEAD

diff --cc share/dictionary
index d470eb4,aef64ae..3722c32
--- 1/share/dictionary
--- 2/share/dictionary
+++ b/share/dictionary
@@@ -74,7 -76,7 +74,8 @@@ $INCLUDE dictionary.extrem
  $INCLUDE dictionary.freeradius
  $INCLUDE dictionary.foundry
  $INCLUDE dictionary.gandalf
 +$INCLUDE dictionary.garderos
+ $INCLUDE dictionary.gemtek
  $INCLUDE dictionary.itk
  $INCLUDE dictionary.juniper
  $INCLUDE dictionary.karlnet