arduino-core libraries +inotool
Improved arduino-core and ino
remove avr gcc from inputs (it should be rebuit with C++ support)
add missing patch for redis on OSX
Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2
Turn on Python plugin for vim_configurable by default

Python plugin for vim is turned on by default in ubuntu and other flavors of linux and mimicking
this in NixOS will help contribut to the impression that NixOS "just works."
Ion3 update to 20090110
zfs-0.6.0-rc13, spl-0.6.0-rc13
Update-walker should use basename of .upstream file for default basename of .nix
More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.
Wine: update to 1.5.20
distcc: making it build
i3: update to 4.4
Merge branch 'master' of github.com:NixOS/nixpkgs
Merge branch 'master' into arduino

Conflicts:
	pkgs/top-level/all-packages.nix
ikiwiki: update to version 3.20121212
Merge pull request #224 from jcumming/zfs.121221

zfs-0.6.0-rc13, spl-0.6.0-rc13
AVR GCC: enable C++ support (makes it usable with Arduino)

  - GCC version bumped, 4.6.1 had some arduino related bug
inotool: add avr-gcc-libc to inputs
Merge branch 'master' into arduino