reconcile korg/master into goog/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:54 +0000 (11:43 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:54 +0000 (11:43 -0700)
commit3952da144dc023605886a6c54a4625d061e13dcb
tree20a0e409741ff46fcbc458a399286619ee711798
parentc6fd606938cfe63e1146cbcabad6da0d40a78432
parent42c6da48052fc2da381a2e7bca148e17999c168e
reconcile korg/master into goog/master