merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
authorJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 13:52:24 +0000 (13:52 +0000)
committerJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 13:52:24 +0000 (13:52 +0000)
commitddce565c6fda1303b0ef1d00b5cb3f05be126139
tree3d57dccc2a18db9fab5beeabc855e0f8ddff9bdf
parentb05d9759af8e5b6001d596a73164e766701b30ec
parentc698ac8aab7671ef3ce7bda9f39b02db37cb40a1
Merge ... '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
     and 'a6c27719ef581b67631459a7dcb52cea53fc0ccf'