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

[sailer]

commit 5ffae3bf42de518176331c11ce1f63e154de2e37
Merge: 67cb407 97c56f3
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Sep 27 22:05:59 2011 +0200

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

 .gitignore          |    2 ++
 octave-control.spec |    8 +++++++-
 sources             |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---