reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:54 +0000 (11:43 -0700)]

Trivial merge