From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 21:59:03 +0200
Subject: [Buildroot] [git commit] Merge branch 'next'
Message-ID: <20120903200546.552DF97235@busybox.osuosl.org>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

commit: http://git.buildroot.net/buildroot/commit/?id=32a0454d3c495b12824ef4a0d0341237302d148a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it