Revision 1878213

Merge r1877259 from trunk:

* r1877259
    Move variable declarations to the start of block the to fix
    syntax errors with VC9 (Visual Studio 2008).
  Justification:
    Our code should be C90.
  Votes:
    +1: brane, stsp, jcorvel
    +0: danielsh (from dev@)