merge of '826e3d1604a7153fbec79dbf0287cbde9dd32200'
authorJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 18:40:56 +0000 (18:40 +0000)
committerJohn Lee <john_lee@openmoko.org>
Tue, 11 Mar 2008 18:40:56 +0000 (18:40 +0000)
commita0f9ca6368207cdfde66bd3f31854bdba67e93fc
tree1af1e6670ca73929113a86dcb1e7d449a3ca7fe4
parent010801ea8f8b51e49a9474012d932b244566cfdd
parent77665f6ed52bddfdb4602fc232b3ed939da5b3ae
Merge ... '826e3d1604a7153fbec79dbf0287cbde9dd32200'
     and 'e8ef8cbc778629395b3eb845590295f8c168d5c1'