Merged changes from trunk

* r3545: Changed to parse namelist section comments for example key assignments.

mkexp

@@ -146,11 +146,11 @@ def format_namelist(section):
     lines = StringIO.StringIO()
     for group, contents in section.iteritems():
         if isinstance(contents, dict):
-            group = group.lower()
-            if not any(map(lambda x: re.match(x, group), black_list)):
+            group_id = group.lower()
+            if not any(map(lambda x: re.match(x, group_id), black_list)):
                 # Create list of removed keys
                 remove_keys = cut_remove_list(contents, '.remove')
-                group_name = re.sub(r' .*$', '', group)
+                group_name = re.sub(r' .*$', '', group_id)
                 lines.write('&'+group_name+'\n')
                 for key, value in contents.iteritems():
                     if key not in remove_keys:
@@ -166,6 +166,10 @@ def format_namelist(section):
                         line = re.sub(r'^#', ' !', line)
                         lines.write(' '*base_indent+key+' = '+
                                     format_value(value, indent)+line+'\n')
+                for line in section.comments.get(group, []):
+                    if line and re.match(r'#\s*\w+\s*=', line):
+                        lines.write(' '*base_indent+
+                                    re.sub(r'^#', '!', line)+'\n')
                 lines.write('/\n')
     return lines.getvalue()