merge of '27a990a9e4bdc09a026f0125d6d771ab891d2156'
authorJohn Lee <john_lee@openmoko.org>
Mon, 17 Mar 2008 03:43:38 +0000 (03:43 +0000)
committerJohn Lee <john_lee@openmoko.org>
Mon, 17 Mar 2008 03:43:38 +0000 (03:43 +0000)
commit81c6671c512b66eada88bddef944e4b200ed3655
tree3a40ede8c3d50a31a8150e17f39ac9fea73669b7
parent2347ce4a3fbe9a4bef175a1e06d7b7297c1c2d7d
parentff7b3adf6c161c7d75ea50870803ccc47a038f76
Merge ... '27a990a9e4bdc09a026f0125d6d771ab891d2156'
     and '754b0cba2322be2fda45270a756d32e5e3eedb7a'