pull from devel

Change-Id: Icb808c91fab2c6d8db64d3f26b03eea66a702193
Signed-off-by: wangbiao <biao716.wang@samsung.com>

diff --cc gitbuildsys/conf.py
index 07542de53f7f8bb8eb1898418ed02e5884f39699,da1742e56ef763226e89932e1d5dbdb5f1fbd3a0..3c28ffadf96d3fa520c00a2a07420cf2c9f18925
--- 1/gitbuildsys/conf.py
--- 2/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@@ -81,11 -81,12 +81,16 @@@ class BrainConfigParser(ConfigParser)
          new_lineno = None
          new_line_written = False
          last_section_line = None
 +        # add line break for comment
 +        if comment is not None:
 +            if not comment.endswith('\n'):
 +                comment += '\n'
  
+         # add line break for comment
+         if comment is not None:
+             if not comment.endswith('\n'):
+                 comment += '\n'
+ 
          lineno = -1
          for lineno in range(len(self._flines)):
              line = self._flines[lineno]