Resolve conflicts for GDB 6.3. Add local patches.ok deraadt@
GDB 6.3 (excluding .info files)
GDB 6.1 (excluding .info files)