Merge branch 'next'
authorPeter Korsgaard <jacmet@sunsite.dk>
Mon, 3 Sep 2012 19:33:25 +0000 (21:33 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 3 Sep 2012 19:59:03 +0000 (21:59 +0200)
commit32a0454d3c495b12824ef4a0d0341237302d148a
tree9acc870d089b0028cecdfb1846b828ae4bd38910
parentf9686563b4fd3eed22e26105f7c440f0b74fcac1
parentdafa32b3bd75e9d155d075c796fa5b0ecbb9b11b
Merge branch 'next'

Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
boot/uboot/uboot.mk
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/multimedia/mpg123/mpg123.mk
package/openssl/openssl.mk
package/smartmontools/smartmontools.mk
package/sudo/sudo.mk