Fixed incomplete merge of geographic aggregates; added support for `Extent`...

Fixed incomplete merge of geographic aggregates; added support for `Extent` aggregate to Oracle spatial backend.  Refs #3566. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9748 bcc190cf-cafb-0310-a4f2-bffc1f526a37