[ReviewBoard/f16] (3 commits) ...New upstream release 1.6.7

[Stephen Gallagher]

Summary of changes:

  1c1d31b... Fix conflict with Django 1.4 (*)
  0784bd0... Fix typo (*)
  950485c... New upstream release 1.6.7 (*)

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