merge of '214ed7e892086095fb4e656e5d3777e201866e46'
authorJohn Lee <john_lee@openmoko.org>
Tue, 22 Jan 2008 04:26:10 +0000 (04:26 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 22 Jan 2008 04:26:10 +0000 (04:26 +0000)
commit34bc75be8e4f52841094c140aac1de9ca88d15fe
tree2824af7ce505f79cbd4914d4cb7aa597dc094899
parentf797c5d5a6af001ccd77de1750013f3fcc970c51
parent0db3088a5bc27d07aaf6c4ccaeda1b020b859961
Merge ... '214ed7e892086095fb4e656e5d3777e201866e46'
     and '824c66fc36263bf7387bf3cac74b83506fa27024'