[dmd-internals] [D-Programming-Language/dmd] ef2a0f: merge fix

[noreply at github.com]

Branch: refs/heads/dmd-1.x
Home:   https://github.com/D-Programming-Language/dmd

Commit: ef2a0f1da10331c4de102ca3e029ea1c1c1a46bf
    https://github.com/D-Programming-Language/dmd/commit/ef2a0f1da10331c4de102ca3e029ea1c1c1a46bf
Author: Walter Bright <walter at walterbright.com>
Date:   2011-04-08 (Fri, 08 Apr 2011)

Changed paths:
  M src/declaration.c
  M src/declaration.h
  M src/expression.h
  M src/interpret.c

Log Message:
-----------
merge fix