merge of 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Dec 2007 15:34:31 +0000 (15:34 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 19 Dec 2007 15:34:31 +0000 (15:34 +0000)
commit070fcac7b8a72094d5a7efe7c7b514b96b20c2ba
tree2f094294a55c6f5c67d10fd27817434a8afa96a5
parent3533f4e6d778b8770770a5b6ca9daa2e9d3c23cf
parentd190d03547f17df923ef4c1efabb5e863b635df9
Merge ... 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
     and 'fd740dda5c7156ecf8aa35ddf9fb0f17b0e4254e'