Synced to 2.5.8

[James S. <jsi...@tr...>]

As you can see I synced up to 2.5.8. Have fun!!!


   . ---
   |o_o |
   |:_/ |   Give Micro$oft the Bird!!!!
  //   \ \  Use Linux!!!!
 (|     | )
 /'_   _/`\
 ___)=(___/