Index: apps/metadata.c
===================================================================
RCS file: /cvsroot/rockbox/apps/metadata.c,v
retrieving revision 1.39
diff -u -r1.39 metadata.c
--- apps/metadata.c	1 Feb 2006 16:42:01 -0000	1.39
+++ apps/metadata.c	8 Feb 2006 09:45:17 -0000
@@ -288,6 +288,10 @@
     {
         p = &(id3->album);
     }
+    else if (strcasecmp(name, "album artist") == 0)
+    {
+        p = &(id3->album_artist);
+    }
     else if (strcasecmp(name, "genre") == 0)
     {
         p = &(id3->genre_string);
Index: apps/screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.138
diff -u -r1.138 screens.c
--- apps/screens.c	21 Jan 2006 23:43:56 -0000	1.138
+++ apps/screens.c	8 Feb 2006 09:45:18 -0000
@@ -1031,6 +1031,7 @@
         line = draw_id3_item(line, top, LANG_ID3_TITLE,  id3->title);
         line = draw_id3_item(line, top, LANG_ID3_ARTIST, id3->artist);
         line = draw_id3_item(line, top, LANG_ID3_ALBUM,  id3->album);
+        line = draw_id3_item(line, top, LANG_ID3_ALBUM_ARTIST,  id3->album_artist);
 
         if (id3->track_string)
         {
Index: apps/gui/gwps-common.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/gwps-common.c,v
retrieving revision 1.39
diff -u -r1.39 gwps-common.c
--- apps/gui/gwps-common.c	7 Feb 2006 20:22:47 -0000	1.39
+++ apps/gui/gwps-common.c	8 Feb 2006 09:45:19 -0000
@@ -454,6 +454,9 @@
                 case 'd':  /* ID3 Album/Disc */
                     return id3->album;
 
+                case 'p':  /* ID3 Album Artist / Perfomer */
+                    return id3->album_artist;
+
                 case 'c':  /* ID3 Composer */
                     return id3->composer;
 
Index: apps/lang/english.lang
===================================================================
RCS file: /cvsroot/rockbox/apps/lang/english.lang,v
retrieving revision 1.218
diff -u -r1.218 english.lang
--- apps/lang/english.lang	7 Feb 2006 20:42:45 -0000	1.218
+++ apps/lang/english.lang	8 Feb 2006 09:45:20 -0000
@@ -3707,3 +3707,8 @@
 voice: ""
 new:
 
+id: LANG_ID3_ALBUM_ARTIST
+desc: in wps
+eng: "[Album artist]"
+voice: ""
+new:
Index: firmware/id3.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/id3.c,v
retrieving revision 1.125
diff -u -r1.125 id3.c
--- firmware/id3.c	1 Feb 2006 16:42:02 -0000	1.125
+++ firmware/id3.c	8 Feb 2006 09:45:21 -0000
@@ -345,6 +345,7 @@
     { "TT2",  3, offsetof(struct mp3entry, title), NULL },
     { "TALB", 4, offsetof(struct mp3entry, album), NULL },
     { "TAL",  3, offsetof(struct mp3entry, album), NULL },
+   { "TALP", 4, offsetof(struct mp3entry, album_artist), NULL },
     { "TRK",  3, offsetof(struct mp3entry, track_string), &parsetracknum },
     { "TRCK", 4, offsetof(struct mp3entry, track_string), &parsetracknum },
     { "TYER", 4, offsetof(struct mp3entry, year_string), &parseyearnum },
Index: firmware/export/id3.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/id3.h,v
retrieving revision 1.26
diff -u -r1.26 id3.h
--- firmware/export/id3.h	1 Feb 2006 16:42:02 -0000	1.26
+++ firmware/export/id3.h	8 Feb 2006 09:45:21 -0000
@@ -53,6 +53,7 @@
     char* title;
     char* artist;
     char* album;
+   char* album_artist;
     char* genre_string;
     char* track_string;
     char* year_string;