merge of '4d03f56302a38e79c12327695f01f27a836720ec'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Dec 2007 15:34:51 +0000 (15:34 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 19 Dec 2007 15:34:51 +0000 (15:34 +0000)
commitd621f09a23b6d0836aae21e19ce3f6073cd16ce4
tree1166c34ed82ab82c2f58c1cc03f161acb35b7427
parent710dd0a432045fe4b33916fe9ed245766a79faec
parent070fcac7b8a72094d5a7efe7c7b514b96b20c2ba
Merge ... '4d03f56302a38e79c12327695f01f27a836720ec'
     and '6e585903810d19bd09a43d9293b04df368f0c308'