Merge branch 'master' of gitorious.org:atom/atom

atom

@@ -669,7 +669,12 @@ getInfos::Ogg() {
 	genre=$(gettag genre)
 	performer=$(gettag performer)
 	title=$(gettag title)
-	tracknum="$(gettag tracknumber)/$(gettag tracktotal)"
+	tracknum=$(gettag tracknumber)
+	tracktotal=$(gettag tracktotal)
+	if [ -n "$tracknum" -a -n "$tracktotal" ]
+	then
+		tracknum="$tracknum/$tracktotal"
+	fi
 	year=$(gettag date)
 	[ -n "$album" 		\
 	-o -n "$albumartist"	\
@@ -1006,7 +1011,7 @@ do
 		album		\
 		disc		\
 		artist		\
-		track		\
+		tracknum	\
 		title		\
 		composer	\
 		performer