r174706 - in /branches/google/main: ./ gcc/Chan...

[dnovillo@gcc.gnu.org]

Author: dnovillo
Date: Mon Jun  6 16:01:33 2011
New Revision: 174706

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=174706
Log:

	Merge from google/integration rev 174705.


Modified:
    branches/google/main/   (props changed)
    branches/google/main/gcc/ChangeLog.google-integration
    branches/google/main/gcc/ChangeLog.google-main
    branches/google/main/gcc/testsuite/ChangeLog.google-integration
    branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/main/libjava/classpath/   (props changed)

Propchange: branches/google/main/
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/
            ('svnmerge-integrated' modified)

Propchange: branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/libjava/classpath/
            ('svn:mergeinfo' modified)