merge of '0d06ef20f42dbc757e10ca1639e06561c357d92d'
authorJohn Lee <john_lee@openmoko.org>
Wed, 19 Mar 2008 12:15:58 +0000 (12:15 +0000)
committerJohn Lee <john_lee@openmoko.org>
Wed, 19 Mar 2008 12:15:58 +0000 (12:15 +0000)
commitadc3e2e2f0a564061d0d13a01d42e1d18940056f
tree8306bb0ba8e36672fbd0705357e49fa303ea3170
parent2e18d83a57863775a87b30eba91122fc89e6191a
parent40faec06b8fac7dd87a1dc0ed25d8d9584a375cc
Merge ... '0d06ef20f42dbc757e10ca1639e06561c357d92d'
     and '3497897aabefa260ab1125e79f685e5829fbf106'