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

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