am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp

* commit '137858b43b7e0ed46fb8ebce9230eb40f0a62432':
  Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards