[gimp-web] Fix link to Kernel concepts pins and a small typo

[Mikael Magnusson <mikachu src gnome org>]

commit 661fec2f97a6df3bb9444a3702df2117021b7b0c
Author: Mikael Magnusson <mikachu gmail com>
Date:   Sat Apr 2 02:03:55 2011 +0200

    Fix link to Kernel concepts pins and a small typo

 about/merchandise.htrw |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/about/merchandise.htrw b/about/merchandise.htrw
index 733304d..f79b411 100755
--- a/about/merchandise.htrw
+++ b/about/merchandise.htrw
@@ -16,7 +16,7 @@ sites of these vendors to see the extent of their contributions.</p>
 <h2>Kernel concepts</h2>
 
 <p>Kernel concepts sells products related to free software, including
-<a href="http://www.kernelconcepts.de/en/shop/products/pins.shtml?funstuff";>pins
+<a href="http://shop.kernelconcepts.de/index.php?cPath=22_30";>pins
 featuring Wilber</a>, the GIMP mascot.</p>
 
 <h1>GIMP on CD</h1>
@@ -42,7 +42,7 @@ containing a GIMP package for Windows.</p>
 
 <h1>Other vendors</h1>
 
-<p>If you intend to sell copies of GIMP n CDs or other media, please
+<p>If you intend to sell copies of GIMP on CDs or other media, please
 have a look at our page about <a href="wgo:about-selling">selling
 GIMP</a>.</p>