python-six: Update to 1.3.0
python-mrbob: fix it and update to 0.1a9
Fix binutils_deterministic to not break evaluation in certain cases. Quite a sneaky bug!
Merge pull request #681 from offlinehacker/mrbob_fix

python-mrbob: Make it work, update to 0.1a9 and update python-six to 1.3.0
Linux 3.4: Doesn't support CONFIG_RC_DEVICES option
Process /etc/fonts/conf.d before upstream fonts/conf.d

Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
google-talk-plugin: Enable screen sharing
disnix: push to latest 0.3 development release
moderntimeline: Add extra source URL
maintainers: change my attrname to be uniform
liferea: add -- A GTK-based news feed reader
whitespace cleaning
libpng: keep versioning in all-packages.nix, not in individual expressions
libpng: merge apng expression (keep patch disabled by default)

I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
kde 4.10: option to use a libcanberra with gtk support

by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
ffmpeg-1.x: passthrough vdpauSupport
firefox 22: use system libpng
eclipse: use latest cairo/gtk

Eclipse seems to work fine without this now (after x-updates merge).