# HG changeset patch
# User Tony Theodore <tonyt@logyst.com>
# Date 1285843180 -36000
# Node ID e4a47d3a7ed6974f063244e16d9121922d9494d8
# Parent  b62218b0ea3c1b954e10266402fbc2a5dbe001cf# Parent  13b7f90158e7012da55d392b1994f97f8fe0ba02
merge

diff -r b62218b0ea3c -r e4a47d3a7ed6 src/gnutls.mk
--- a/src/gnutls.mk	Thu Sep 30 20:38:20 2010 +1000
+++ b/src/gnutls.mk	Thu Sep 30 20:39:40 2010 +1000
@@ -4,8 +4,8 @@
 # GnuTLS
 PKG             := gnutls
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.10.1
-$(PKG)_CHECKSUM := 507ff8ad7c1e042f8ecaa4314f32777e74caf0d3
+$(PKG)_VERSION  := 2.10.2
+$(PKG)_CHECKSUM := 2704b7b86fc5e3444afcf20feb7bc9ff117d4816
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
diff -r b62218b0ea3c -r e4a47d3a7ed6 src/imagemagick.mk
--- a/src/imagemagick.mk	Thu Sep 30 20:38:20 2010 +1000
+++ b/src/imagemagick.mk	Thu Sep 30 20:39:40 2010 +1000
@@ -4,8 +4,8 @@
 # ImageMagick
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.6.4-7
-$(PKG)_CHECKSUM := 6405d62f60d5b9780ac90361984caf6b055c4a5c
+$(PKG)_VERSION  := 6.6.4-8
+$(PKG)_CHECKSUM := 9016b8fe4b48dead5a2e5770ad68d86d5b0c92fc
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.imagemagick.org/