Merge remote-tracking branch 'origin' into phonon

src/libtomahawk/album.cpp

@@ -22,6 +22,7 @@ Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& ar
     }
 
     album_ptr a = album_ptr( new Album( id, name, artist ) );
+    if ( id > 0 )
         s_albums.insert( id, a );
 
     return a;

src/libtomahawk/artist.cpp

@@ -25,7 +25,6 @@ Artist::get( unsigned int id, const QString& name )
     }
 
     artist_ptr a = artist_ptr( new Artist( id, name ) );
-
     if ( id > 0 )
         s_artists.insert( id, a );