[jd] (6 commits) ...Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

Summary of changes:

  627fbd5... rev 4017 (*)
  5e54b2e... rev 4020 (*)
  ac6fdc8... 2.8.5 rc 120811 (*)
  a6e8885... 2.8.5 (*)
  6d23a42... Merge remote-tracking branch 'origin/master' into f17 (*)
  32b2714... Merge remote-tracking branch 'origin/master' into f17 (*)

(*) This commit already existed in another branch; no separate mail sent