merge fix for blank lines from trunk
1 file changed