am ca7f1614: Merge "Added additional, acceptable bootloader and baseband versions" into froyo

Merge commit 'ca7f1614bb7921a5eb3b3b7fd8c1db6c9aeedb79' into gingerbread

* commit 'ca7f1614bb7921a5eb3b3b7fd8c1db6c9aeedb79':
  Added additional, acceptable bootloader and baseband versions