Merge branch 't/error2'
authorAndre Noll <maan@systemlinux.org>
Sun, 1 Aug 2010 11:25:59 +0000 (13:25 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 1 Aug 2010 11:25:59 +0000 (13:25 +0200)
commit75cf863ef7a7cf5fe346f098ffb07a472b8366ec
treea40a0f1d8d1a37a3df63fd45f2582c0a189ec30a
parentf20f4e2e747e7ef38ceadec6ee777f23ce0eca83
parent5842e3e7f2aa17fe16cb806b4ba955ce1f25ce53
Merge branch 't/error2'