reconcile korg/master into goog/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)
commitc38107a7674d2c74a213228afe52eb6486dfea6c
tree09ec85be7c999459d89f9add38c63e41c2344dd4
parent0b8c79a2f6cf87f09bd6d9b7d404faa924af8ee2
parent53ca62d15f255cae115aac69d7ab2b825c689ed1
reconcile korg/master into goog/master