Changes from SVN

Now that all my commits go first to WordPress.org SVN I'm not sure how
to mantain this.

Lets psuh the changes manuall for now.