[gnome-color-manager: 3/3] Merge branch 'lcms-split'

[Richard Hughes <rhughes src gnome org>]

commit 9ab84b9a808915c916e4af2af7099314bd5d5838
Merge: 6a2336c 57e3ca7
Author: Richard Hughes <richard hughsie com>
Date:   Wed Dec 23 16:57:09 2009 +0000

    Merge branch 'lcms-split'

 src/Makefile.am         |    3 +
 src/gcm-cie-widget.c    |    2 +-
 src/gcm-dbus.c          |    4 +-
 src/gcm-dump-profile.c  |    2 +-
 src/gcm-import.c        |    2 +-
 src/gcm-inspect.c       |    2 +-
 src/gcm-prefs.c         |    6 +-
 src/gcm-profile-lcms1.c | 1010 ++++++++++++++++++++++++++++++++++++++++
 src/gcm-profile-lcms1.h |   66 +++
 src/gcm-profile.c       | 1189 ++++++-----------------------------------------
 src/gcm-profile.h       |   12 +-
 src/gcm-trc-widget.c    |    2 +-
 src/gcm-utils.c         |  123 +++++-
 src/gcm-utils.h         |    3 +
 14 files changed, 1369 insertions(+), 1057 deletions(-)
---