2. Modified code to handle the change 3. Updated the previously merged obsolete copy of branch gsoc2010-testbed. svn-id: r52973