[graphite] Merge from trunk

[Sebastian Pop]

Hi,

I just merged the changes from trunk into the graphite branch:

2010-05-05  Sebastian Pop  <sebastian....@amd.com>

        * Merge from mainline (170411:173446).