merge of '9069b40ccba3d40edd8269797ab9b49024e8bdc8'
authorJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 12:53:35 +0000 (12:53 +0000)
committerJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 12:53:35 +0000 (12:53 +0000)
commit06fb90eb31b0b85a5c5c7adf185ce2515c5b1220
treec16abefe49aa3e402a17afdd287baf8011e79a31
parentb781aba534b1c5ba47a00fe9e2caaf8743536100
parentd7136ff4c2bdb1e7a68189e2023afe19ed16343d
Merge ... '9069b40ccba3d40edd8269797ab9b49024e8bdc8'
     and '982885ad3ab91bcc7c7f4e1ee624f2202fecf617'