From: Len Brown Date: Sun, 26 Dec 2010 22:05:07 +0000 (-0500) Subject: Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release X-Git-Tag: v2.6.37-rc8~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad;p=people%2Fms%2Flinux.git Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release --- bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad