[octave-control/f16: 2/2] Merge remote-tracking branch 'origin/master' into f16

[sailer]

commit 67cb4077d971f52e1f0692cbc65cc9754c9cab89
Merge: 1f4919a 9bbc091
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Wed Sep 7 07:13:35 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16

 .gitignore          |    1 +
 octave-control.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---