iPod plugin has to sort tracks not only by track number, but also by disc number

It would be a great bug fix if the iPod plugin would sort songs from albums with multiple discs not only by track number but also by disc number, like iTunes does.

For example, if an album has 2 discs and 10 songs on each disc, then the current iPod plugin tells the iPod database to sort the songs like this:

Song 1 from Disc 1
Song 1 from Disc 2
Song 2 from Disc 1
Song 2 from Disc 2
...
Song 10 from Disc 1
Song 10 from Disc 2

But that is not correct and not the iTunes behavior. Correct behavior would be:

Song 1 from Disc 1
Song 2 from Disc 1
...
Song 10 from Disc 1
Song 1 from Disc 2
Song 2 from Disc 2
...
Song 10 from Disc 2

Please fix this bug soon.
Personally, because of this, I don't want to switch to Songbird yet. There's many Compilation Albums in my library and I'd like to listen to the tracks in their original order.