Merge pull request #238 from Alexpux/develop

Backport patch for fixing dwarf to gcc-4.6.4