Merged changes from /trunk/echam-dev/util/mkexp

* r3341: Changed comments in namelist to deal with inline comments and empty lines

mkexp

@@ -142,10 +142,15 @@ def format_namelist(section):
                     key = key.lower()
                     indent = base_indent + len(key) + 3
                     for line in contents.comments.get(key, []):
-                        lines.write(' '*base_indent+re.sub(r'^#', '!', line)+
-                                    '\n')
+                        if line:
+                            lines.write(' '*base_indent+
+                                        re.sub(r'^#', '!', line)+'\n')
+                    line = contents.inline_comments[key]
+                    if not line:
+                        line = ''
+                    line = re.sub(r'^#', ' !', line)
                     lines.write(' '*base_indent+key+' = '+
-                                format_value(value, indent)+'\n')
+                                format_value(value, indent)+line+'\n')
                 lines.write('/\n')
     return lines.getvalue()