merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
authorJohn Lee <john_lee@openmoko.org>
Wed, 23 Jan 2008 04:05:57 +0000 (04:05 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 23 Jan 2008 04:05:57 +0000 (04:05 +0000)
commit9abe95dd3d38718f0d399bcf858f35652e14400c
treee06fcc9e9045d9ea4a9868f520208ef5c03c6ecb
parent80ed869c73abee32442ead36dec94b4b84020a97
parent197a36f6add53d65332aa4dd33bc013270b6c927
Merge ... '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
     and 'a22503624f899a2e28116f2ca9acb54520778734'