Branche merge

diff --cc debian/changelog
index b99c347,a7db5aa..bb70521
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,15 @@@
  grml-hwinfo (0.3-3) unstable; urgency=low
  
-   * Add procinfo to suggests.
 +  [Michael Prokop]
 +  * Improve code layout (like checks for binaries, portability for
 +    non-grml system).
 +  * Do not overwrite existing info.tar.bz2 files but use timestamp
 +    in filename instead.
 +
 +  [Alexander Wirt]
 -  * Fix output if some optional packages are not installed
+   * Add procinfo to suggests
  
 - -- Alexander Wirt <formorer@grml.org>  Mon, 11 Jun 2007 11:47:08 +0200
 + -- Michael Prokop <mika@grml.org>  Mon, 11 Jun 2007 12:06:28 +0200
  
  grml-hwinfo (0.3-2) unstable; urgency=low