resolved conflicts for merge of fd860fde to master
authorJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 02:58:45 +0000 (19:58 -0700)
committerJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 02:58:45 +0000 (19:58 -0700)
commit0c2e7c98bfd7cadf95cd4a8f03dff96475147a76
treebeb2d7e92e4c96474d09944f2e8cdea0799955df
parentadfd9ee0c6129953bb0194905d6db8ca80488a67
parentfd860fde813f58808b389fbc4f9120a89a90b27e
resolved conflicts for merge of fd860fde to master

Change-Id: Ib2d933ce3edfa1b5e6cd57c1c1ea244eedb6e572