tree 8f4d8aa4900dd88963c234bc5cf3e9dcb2168878
parent 3c659a8d647b2650d83712f9a6724b8ac50ef5ae
parent 8417d698cff733f3c5de08f2fa96b67bf4a9f795
author Brian Swetland <swetland@google.com> 1281571302 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281571302 -0700

am 8417d698: handle 4096 byte pages if requested via --pagesize

Merge commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795' into gingerbread-plus-aosp

* commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795':
  handle 4096 byte pages if requested via --pagesize