[library-web: 64/65] Merge branch 'master' into new-website-style

[Frederic Peters <fpeters src gnome org>]

commit 60c08ab41147f0739d5453790e8d871cdddba2b3
Merge: 391eaee a1a78e8
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Apr 1 16:09:45 2011 +0530

    Merge branch 'master' into new-website-style
    
    Conflicts:
    	data/overlay.xml.in

 data/extra-tarballs |    1 +
 data/overlay.xml.in |    8 +
 po/ko.po            |  967 ++++++++++++++++++++++++++++++++++++++++-----------
 po/pa.po            |  481 ++++++++++++++-----------
 4 files changed, 1037 insertions(+), 420 deletions(-)
---
diff --cc data/overlay.xml.in
index eca3f78,58ebd28..faba4d4
--- a/data/overlay.xml.in
+++ b/data/overlay.xml.in
@@@ -432,12 -398,13 +432,20 @@@
        <subsection>api-others</subsection>
        <_abstract>
          JSON-GLib is a library for reading and parsing JSON using GLib and
+         GObject data types and API.
+       </_abstract>
+     </document>
+ 
+     <document doc_module="cogl" channel="devel">
+       <subsection>api-others</subsection>
+       <_abstract>
++        JSON-GLib is a library for reading and parsing JSON using GLib and
 +        GObject data types and API.
 +      </_abstract>
 +    </document>
 +
 +    <document doc_module="cogl" channel="devel">
 +      <_abstract>
          COGL is a low level OpenGL abstraction library developed for (and part
  	of) Clutter. It is used primarily by Clutter to provide a common rendering
  	API that works transparently across OpenGL >=1.4, OpenGL ES 1.1 and OpenGL