[phobos] [D-Programming-Language/phobos] aaa71a: Fix the )*(#$# conflict symbols. Man, I hate Git.

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/phobos

  Commit: aaa71a9e3a15b12f22c7e92bf4678585cd156d52
      https://github.com/D-Programming-Language/phobos/commit/aaa71a9e3a15b12f22c7e92bf4678585cd156d52
  Author: dsimcha <dsimcha at gmail.com>
  Date:   2011-08-13 (Sat, 13 Aug 2011)

  Changed paths:
    M std/parallelism.d

  Log Message:
  -----------
  Fix the )*(#$# conflict symbols.  Man, I hate Git.