New openCV master repo symc
Merge remote-tracking branch 'upstream/master'
About to implement cvtColor
Merge remote-tracking branch 'upstream/cuda-dev'
Merge remote-tracking branch 'upstream/2.4'

Conflicts:
	android/service/engine/AndroidManifest.xml
Rotation strut stubbed out.
Bunk sorting. Hopefully this works.
Merge branch 'master' of https://github.com/Jazmann/opencv

ann/opencv
Pixel Color conversion algorithm implemented for 8bit unsigned colour.
Add OpenCV core file to project for editing
Added CV_4U and CV_2U data types to OPenCV type preprocessor definition. This facilitated the integration with external image Data types such as the UIImage container from iOS.
Added transform methor with different source destination and transform matrix types.
Added typedefs and template classes for 2 bit and 4 bit ints.
Added support for unsigned longs.
junk
Merge branch 'master' of https://github.com/Jazmann/opencv
Fixed erroneous plist directory path.
FIxed typos
Merge our stuff

Merge remote-tracking branch 'origin'
Update to 10/12/12 version of OpenCV
Update cuda_dev to 10/12/12 version

Merge remote-tracking branch 'upstream/cuda-dev'
Merge remote-tracking branch 'upstream/2.4'