branches/powerups: merged the trunk to branches/powerup merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD conflicts resolved in favor of the trunk